diff --git a/conf/machine/apalis-imx6.conf b/conf/machine/apalis-imx6.conf index e60ec40..b11c9e3 100644 --- a/conf/machine/apalis-imx6.conf +++ b/conf/machine/apalis-imx6.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx6:mx6q:" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa9.inc +include conf/machine/include/arm/armv7a/tune-cortexa9.inc PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex" KERNEL_DEVICETREE += "imx6q-apalis-eval.dtb imx6q-apalis-ixora.dtb \ diff --git a/conf/machine/cgtqmx6.conf b/conf/machine/cgtqmx6.conf index bce34b1..7cf2f58 100644 --- a/conf/machine/cgtqmx6.conf +++ b/conf/machine/cgtqmx6.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa9.inc +include conf/machine/include/arm/armv7a/tune-cortexa9.inc PREFERRED_PROVIDER_u-boot ?= "u-boot-congatec" PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-congatec" diff --git a/conf/machine/colibri-imx6.conf b/conf/machine/colibri-imx6.conf index 3f77c8d..8ed676d 100644 --- a/conf/machine/colibri-imx6.conf +++ b/conf/machine/colibri-imx6.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx6:mx6dl:" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa9.inc +include conf/machine/include/arm/armv7a/tune-cortexa9.inc PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex" KERNEL_DEVICETREE += "imx6dl-colibri-eval-v3.dtb imx6dl-colibri-cam-eval-v3.dtb \ diff --git a/conf/machine/colibri-imx6ull.conf b/conf/machine/colibri-imx6ull.conf index 3b24edc..ffea275 100644 --- a/conf/machine/colibri-imx6ull.conf +++ b/conf/machine/colibri-imx6ull.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa7.inc +include conf/machine/include/arm/armv7a/tune-cortexa7.inc PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ?= "linux-toradex" KERNEL_DEVICETREE += "imx6ull-colibri-eval-v3.dtb imx6ull-colibri-wifi-eval-v3.dtb" diff --git a/conf/machine/colibri-imx7-emmc.conf b/conf/machine/colibri-imx7-emmc.conf index 4a9f0cd..3e304f5 100644 --- a/conf/machine/colibri-imx7-emmc.conf +++ b/conf/machine/colibri-imx7-emmc.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx7:mx7d:" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa7.inc +include conf/machine/include/arm/armv7a/tune-cortexa7.inc PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex" diff --git a/conf/machine/colibri-imx7-nand.conf b/conf/machine/colibri-imx7-nand.conf index c257b66..e562c9c 100644 --- a/conf/machine/colibri-imx7-nand.conf +++ b/conf/machine/colibri-imx7-nand.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx7:mx7d:colibri-imx7:" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa7.inc +include conf/machine/include/arm/armv7a/tune-cortexa7.inc PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex" diff --git a/conf/machine/colibri-vf.conf b/conf/machine/colibri-vf.conf index 50a5f43..e0173f7 100644 --- a/conf/machine/colibri-vf.conf +++ b/conf/machine/colibri-vf.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "vf:vf50:vf60:" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa5.inc +include conf/machine/include/arm/armv7a/tune-cortexa5.inc PREFERRED_PROVIDER_virtual/kernel_use-nxp-bsp ??= "linux-toradex" diff --git a/conf/machine/cubox-i.conf b/conf/machine/cubox-i.conf index b424815..f210292 100644 --- a/conf/machine/cubox-i.conf +++ b/conf/machine/cubox-i.conf @@ -13,7 +13,7 @@ MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:" require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa9.inc +require conf/machine/include/arm/armv7a/tune-cortexa9.inc PREFERRED_PROVIDER_virtual/kernel ?= "linux-fslc" diff --git a/conf/machine/imx6dl-riotboard.conf b/conf/machine/imx6dl-riotboard.conf index e3e2f05..cf2172c 100644 --- a/conf/machine/imx6dl-riotboard.conf +++ b/conf/machine/imx6dl-riotboard.conf @@ -5,7 +5,7 @@ #@MAINTAINER: Nikolay Dimitrov include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa9.inc +include conf/machine/include/arm/armv7a/tune-cortexa9.inc MACHINEOVERRIDES =. "mx6:mx6dl:" diff --git a/conf/machine/imx6q-dms-ba16.conf b/conf/machine/imx6q-dms-ba16.conf index 56065d9..4577665 100644 --- a/conf/machine/imx6q-dms-ba16.conf +++ b/conf/machine/imx6q-dms-ba16.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx6:mx6q:" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa9.inc +include conf/machine/include/arm/armv7a/tune-cortexa9.inc UBOOT_MACHINE = "dms-ba16_defconfig" diff --git a/conf/machine/imx6qdl-pico.conf b/conf/machine/imx6qdl-pico.conf index e397f4b..a3c6e02 100644 --- a/conf/machine/imx6qdl-pico.conf +++ b/conf/machine/imx6qdl-pico.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:" require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa9.inc +require conf/machine/include/arm/armv7a/tune-cortexa9.inc IMX_DEFAULT_BSP = "mainline" IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" diff --git a/conf/machine/imx6qdl-variscite-som.conf b/conf/machine/imx6qdl-variscite-som.conf index e39b930..56cb719 100644 --- a/conf/machine/imx6qdl-variscite-som.conf +++ b/conf/machine/imx6qdl-variscite-som.conf @@ -8,7 +8,7 @@ MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:" DEFAULTTUNE ?= "cortexa9thf-neon" require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa9.inc +require conf/machine/include/arm/armv7a/tune-cortexa9.inc PREFERRED_PROVIDER_virtual/kernel = "linux-variscite" PREFERRED_PROVIDER_virtual/kernel_use-mainline-bsp ??= "linux-fslc" diff --git a/conf/machine/imx6sl-warp.conf b/conf/machine/imx6sl-warp.conf index 2f45793..93fd9fd 100644 --- a/conf/machine/imx6sl-warp.conf +++ b/conf/machine/imx6sl-warp.conf @@ -25,7 +25,7 @@ MACHINEOVERRIDES =. "mx6:mx6sl:" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa9.inc +include conf/machine/include/arm/armv7a/tune-cortexa9.inc IMX_DEFAULT_BSP = "mainline" diff --git a/conf/machine/imx6ul-kontron.conf b/conf/machine/imx6ul-kontron.conf index 1a779a8..5141665 100644 --- a/conf/machine/imx6ul-kontron.conf +++ b/conf/machine/imx6ul-kontron.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx6:mx6ul:" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa7.inc +include conf/machine/include/arm/armv7a/tune-cortexa7.inc IMX_DEFAULT_BSP = "mainline" diff --git a/conf/machine/imx6ul-pico.conf b/conf/machine/imx6ul-pico.conf index 4efe284..a61637f 100644 --- a/conf/machine/imx6ul-pico.conf +++ b/conf/machine/imx6ul-pico.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx6:mx6ul:" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa7.inc +include conf/machine/include/arm/armv7a/tune-cortexa7.inc IMX_DEFAULT_BSP = "mainline" IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" diff --git a/conf/machine/imx7d-pico.conf b/conf/machine/imx7d-pico.conf index 4e67e78..c4988b8 100644 --- a/conf/machine/imx7d-pico.conf +++ b/conf/machine/imx7d-pico.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx7:mx7d:" require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa7.inc +require conf/machine/include/arm/armv7a/tune-cortexa7.inc IMX_DEFAULT_BSP = "mainline" IMX_DEFAULT_BOOTLOADER = "u-boot-fslc" diff --git a/conf/machine/imx7d-remarkable2.conf b/conf/machine/imx7d-remarkable2.conf index 4fc55aa..b63e208 100644 --- a/conf/machine/imx7d-remarkable2.conf +++ b/conf/machine/imx7d-remarkable2.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx7:mx7d:" require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa7.inc +require conf/machine/include/arm/armv7a/tune-cortexa7.inc IMX_DEFAULT_BSP = "mainline" SERIAL_CONSOLES = "115200;ttymxc5" diff --git a/conf/machine/imx7s-warp.conf b/conf/machine/imx7s-warp.conf index 59398ec..5f09970 100644 --- a/conf/machine/imx7s-warp.conf +++ b/conf/machine/imx7s-warp.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx7:mx7d:" require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa7.inc +require conf/machine/include/arm/armv7a/tune-cortexa7.inc IMX_DEFAULT_BSP = "mainline" diff --git a/conf/machine/include/imx233-olinuxino.inc b/conf/machine/include/imx233-olinuxino.inc index c45e917..07aa4db 100644 --- a/conf/machine/include/imx233-olinuxino.inc +++ b/conf/machine/include/imx233-olinuxino.inc @@ -4,7 +4,7 @@ MACHINEOVERRIDES =. "mxs:mx23:imx233-olinuxino:" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-arm926ejs.inc +include conf/machine/include/arm/armv5/tune-arm926ejs.inc # This machine is not supported by u-boot-imx as it is not tested by NXP on this # board. So we force it to use u-boot-fslc which is based on mainline here. diff --git a/conf/machine/nitrogen6sx.conf b/conf/machine/nitrogen6sx.conf index be3bb4a..96bd946 100644 --- a/conf/machine/nitrogen6sx.conf +++ b/conf/machine/nitrogen6sx.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6:mx6sx:" IMX_DEFAULT_BSP ?= "nxp" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa9.inc +include conf/machine/include/arm/armv7a/tune-cortexa9.inc KERNEL_DEVICETREE = "imx6sx-nitrogen6sx.dtb" KERNEL_IMAGETYPE = "zImage" diff --git a/conf/machine/nitrogen6x-lite.conf b/conf/machine/nitrogen6x-lite.conf index e5c8674..921c4c2 100644 --- a/conf/machine/nitrogen6x-lite.conf +++ b/conf/machine/nitrogen6x-lite.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx6:mx6dl:" IMX_DEFAULT_BSP ?= "nxp" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa9.inc +include conf/machine/include/arm/armv7a/tune-cortexa9.inc KERNEL_DEVICETREE = "imx6dl-nit6xlite.dtb" KERNEL_IMAGETYPE = "zImage" diff --git a/conf/machine/nitrogen6x.conf b/conf/machine/nitrogen6x.conf index 078a14c..2357bfc 100644 --- a/conf/machine/nitrogen6x.conf +++ b/conf/machine/nitrogen6x.conf @@ -34,7 +34,7 @@ MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:" IMX_DEFAULT_BSP ?= "nxp" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa9.inc +include conf/machine/include/arm/armv7a/tune-cortexa9.inc KERNEL_DEVICETREE = "imx6q-sabrelite.dtb \ imx6q-nitrogen6_max.dtb imx6qp-nitrogen6_max.dtb \ diff --git a/conf/machine/nitrogen7.conf b/conf/machine/nitrogen7.conf index 8e900ce..d75fcd1 100644 --- a/conf/machine/nitrogen7.conf +++ b/conf/machine/nitrogen7.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx7:mx7d:" IMX_DEFAULT_BSP ?= "nxp" require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa7.inc +require conf/machine/include/arm/armv7a/tune-cortexa7.inc KERNEL_DEVICETREE = "imx7d-nitrogen7.dtb" KERNEL_IMAGETYPE = "zImage" diff --git a/conf/machine/nitrogen8m.conf b/conf/machine/nitrogen8m.conf index 0187b33..3722472 100644 --- a/conf/machine/nitrogen8m.conf +++ b/conf/machine/nitrogen8m.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" IMX_DEFAULT_BSP ?= "nxp" require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa53.inc +require conf/machine/include/arm/armv8a/tune-cortexa53.inc # Kernel configuration PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary" diff --git a/conf/machine/nitrogen8mm.conf b/conf/machine/nitrogen8mm.conf index 1245f4b..7d56077 100644 --- a/conf/machine/nitrogen8mm.conf +++ b/conf/machine/nitrogen8mm.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:" IMX_DEFAULT_BSP ?= "nxp" require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa53.inc +require conf/machine/include/arm/armv8a/tune-cortexa53.inc # Kernel configuration PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary" diff --git a/conf/machine/nitrogen8mn.conf b/conf/machine/nitrogen8mn.conf index e0c48d0..1b045c2 100644 --- a/conf/machine/nitrogen8mn.conf +++ b/conf/machine/nitrogen8mn.conf @@ -9,7 +9,7 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:" IMX_DEFAULT_BSP ?= "nxp" require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa53.inc +require conf/machine/include/arm/armv8a/tune-cortexa53.inc # Kernel configuration PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary" diff --git a/conf/machine/nitrogen8mp.conf b/conf/machine/nitrogen8mp.conf index 8754e49..ddff923 100644 --- a/conf/machine/nitrogen8mp.conf +++ b/conf/machine/nitrogen8mp.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx8:mx8m:mx8mp:" require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa53.inc +require conf/machine/include/arm/armv8a/tune-cortexa53.inc # Kernel configuration PREFERRED_PROVIDER_virtual/kernel ??= "linux-boundary" diff --git a/conf/machine/ventana.conf b/conf/machine/ventana.conf index 31b7d0f..8dbbf8a 100644 --- a/conf/machine/ventana.conf +++ b/conf/machine/ventana.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:" require conf/machine/include/imx-base.inc -require conf/machine/include/tune-cortexa9.inc +require conf/machine/include/arm/armv7a/tune-cortexa9.inc PREFERRED_PROVIDER_virtual/bootloader = "u-boot-gateworks-imx" PREFERRED_PROVIDER_u-boot = "u-boot-gateworks-imx" diff --git a/conf/machine/wandboard.conf b/conf/machine/wandboard.conf index 13fcada..f569ecc 100644 --- a/conf/machine/wandboard.conf +++ b/conf/machine/wandboard.conf @@ -7,7 +7,7 @@ MACHINEOVERRIDES =. "mx6:mx6dl:mx6q:" include conf/machine/include/imx-base.inc -include conf/machine/include/tune-cortexa9.inc +include conf/machine/include/arm/armv7a/tune-cortexa9.inc IMX_DEFAULT_BSP = "mainline"