machines: Adjust for using new location of tune files from core

Signed-off-by: Khem Raj <raj.khem@gmail.com>

diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index 8abc5a958a676baa857c160204d86cc61dc83e0e..5e8be1e904e68bd329d9745f2860ca0dac4d35e4 100644 (file)
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mxs:mx23:"
 
 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/imx25pdk.conf b/conf/machine/imx25pdk.conf
index 5721e845b03a1497f74abed996b304fc16efddf8..2abadb25b9b44c8a727384dcdbcf215dd78dbdaf 100644 (file)
--- a/conf/machine/imx25pdk.conf
+++ b/conf/machine/imx25pdk.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mx25:"
 
 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/imx28evk.conf b/conf/machine/imx28evk.conf
index 4f69dae4dbaad363907edc3636051acc648ba75e..9763a3968e95d7f59fe939052f19f9e630c73801 100644 (file)
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mxs:mx28:"
 
 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/imx51evk.conf b/conf/machine/imx51evk.conf
index 80d7b38601a4255168215dfa1dcd28571de22934..7c66435dc611d68713520599dc0fb09faffcf855 100644 (file)
--- a/conf/machine/imx51evk.conf
+++ b/conf/machine/imx51evk.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mx5:mx51:"
 
 include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa8.inc
+include conf/machine/include/arm/armv7a/tune-cortexa8.inc
 
 KERNEL_DEVICETREE = "imx51-babbage.dtb"
 

diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index af5aeb3bc0c9254c5127ecc00dc697df85ed8e40..b2c65b84fce057db20fd2fd3118f2577664402ec 100644 (file)
--- a/conf/machine/imx53ard.conf
+++ b/conf/machine/imx53ard.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mx5:mx53:"
 
 include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa8.inc
+include conf/machine/include/arm/armv7a/tune-cortexa8.inc
 
 # Disable perf features as 2.6.35.3 fails to build otherwise
 PERF_FEATURES_ENABLE = ""

diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index 06d4a75694cc84c759daf88bb602059cb6a15cc1..0d6a7b2255b21c886c5ae522e4a35d3a1287b577 100644 (file)
--- a/conf/machine/imx53qsb.conf
+++ b/conf/machine/imx53qsb.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mx5:mx53:"
 
 include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa8.inc
+include conf/machine/include/arm/armv7a/tune-cortexa8.inc
 
 KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb"
 

diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 0b5274cb8149397930896b1a1a1ae0efd63a1d82..8069fb3f7832c544b78e9b875caa1a8569cc09c8 100644 (file)
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -14,7 +14,7 @@
 MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:"
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa9.inc
+require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
 KERNEL_DEVICETREE = " \
     imx6qp-sabreauto.dtb imx6qp-sabreauto-ecspi.dtb imx6qp-sabreauto-flexcan1.dtb \

diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 27a2e9d7fa7fe37163e8d0bc35485ec5de04a649..215e0183475a9a6b6e7f4fb285b83f8dd243d242 100644 (file)
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -14,7 +14,7 @@
 MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:"
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa9.inc
+require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
 KERNEL_DEVICETREE = " \
        imx6qp-sabresd-btwifi.dtb \

diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index 8bef21b680b4a9a701d9ce286b9c51275399fce0..b25182ba9dbcd014d6880f9a652c1c0680bc7ba7 100644 (file)
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mx6:mx6sl:"
 
 include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
+require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
 KERNEL_DEVICETREE = "imx6sl-evk.dtb"
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \

diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf
index 6282533aa4f1136df4adf573034d0eaabf9258d5..ea5258454f60c610e7f0ccf9fb02ed553a8ff399 100644 (file)
--- a/conf/machine/imx6sllevk.conf
+++ b/conf/machine/imx6sllevk.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mx6:mx6sll:"
 
 include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa9.inc
+require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
 KERNEL_DEVICETREE = "imx6sll-evk.dtb"
 

diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index 2354635e2b33663c42d1b2d677f53f6f46186711..9e83c45808ca7135ac915f1fd139212ab1fc3da6 100644 (file)
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mx6:mx6sx:"
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa9.inc
+require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
 KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb"
 KERNEL_DEVICETREE:use-mainline-bsp = "imx6sx-sabreauto.dtb"

diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index fcfcbd5f41c7ace9ca5dfc19f2d5f44b7eb23983..d0a89596c2b2920e522a61af3c076f273477b6b4 100644 (file)
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mx6:mx6sx:"
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa9.inc
+require conf/machine/include/arm/armv7a/tune-cortexa9.inc
 
 KERNEL_DEVICETREE = " \
     imx6sx-sdb.dtb \

diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 6fd14456fb29aa29b94be80e07a2a077e9990ded..09d64b4ef16cf111563f3a8e1e4d8a9afba505a7 100644 (file)
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.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
 
 MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455"
 

diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index f5b7309fbe6bea1371dc5ea1e6a93dae25b165fc..e71e34e4902446d90e8f7777c45129547dc555ab 100644 (file)
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mx6:mx6ull:"
 
 include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa7.inc
+include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455"
 

diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf
index a27f1ef112772be30e8fd8e8cbf9b4c7c06f8017..a47c08f88a2d254595d84344d9154edc7084b2d9 100644 (file)
--- a/conf/machine/imx6ulz-14x14-evk.conf
+++ b/conf/machine/imx6ulz-14x14-evk.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:mx6ulz:"
 
 include conf/machine/include/imx-base.inc
-include conf/machine/include/tune-cortexa7.inc
+include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455"
 

diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 860c8007f7114c3854d187f9db770a65db5d714f..7183d6f94e420cc13188f6b62e6d2b927b319bd1 100644 (file)
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mx7:mx7d:"
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa7.inc
+include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455"
 

diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index d685a90caca216569da239c166851cd56f377c65..e096124075bcf0705e84eaf6398b5578e6a0de17 100644 (file)
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mx7:mx7ulp:"
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa7.inc
+include conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 MACHINE_FEATURES += "pci wifi bluetooth bcm43430"
 

diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index b6dcd89026bb1e6bf32a4b158a5be56cea888f01..e16bc504e41300bb27fabb979fff685d80b11177 100644 (file)
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -7,7 +7,7 @@
 MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:"
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa53.inc
+require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 
 IMX_DEFAULT_BSP = "nxp"
 

diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index eb6ceced057ba7284c8abb8bfc56e8bbbdbb70c9..c2e450ce90b8b9d7b084ae4fba08378e4a1bc199 100644 (file)
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -6,7 +6,7 @@
 MACHINEOVERRIDES =. "mx8:mx8qm:"
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa72-cortexa53.inc
+require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
 
 IMX_DEFAULT_BSP = "nxp"
 

diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index a33485beae4fed2dbb4d77791b4df3ff98d724df..aa60d95e60362840266b375d9fb00e7f8eddeba8 100644 (file)
--- a/conf/machine/include/e500mc.inc
+++ b/conf/machine/include/e500mc.inc
@@ -1,6 +1,6 @@
 TARGET_FPU = "hard"
 
-require conf/machine/include/tune-ppce500mc.inc
+require conf/machine/include/powerpc/tune-ppce500mc.inc
 require conf/machine/include/qoriq-ppc.inc
 
 MACHINEOVERRIDES =. "e500mc:"

diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc
index 420f0343bda957e77997ef46f7802a0a3aea6c11..a9af67cdace85fa386ad1444596eba4ce0fa1b7c 100644 (file)
--- a/conf/machine/include/e500v2.inc
+++ b/conf/machine/include/e500v2.inc
@@ -1,4 +1,4 @@
-require conf/machine/include/tune-ppce500v2.inc
+require conf/machine/include/powerpc/tune-ppce500v2.inc
 
 MACHINEOVERRIDES =. "e500v2:"
 require conf/machine/include/qoriq-ppc.inc

diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc
index f384b34a74a5677607beeda43ea4e81f057fd78a..42acb2f245b799587712c87205ba66774cdcce0a 100644 (file)
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -1,7 +1,7 @@
 TARGET_FPU = "hard"
 DEFAULTTUNE ?= "ppc64e5500"
 
-require conf/machine/include/tune-ppce5500.inc
+require conf/machine/include/powerpc/tune-ppce5500.inc
 require conf/machine/include/qoriq-ppc.inc
 
 MACHINEOVERRIDES =. "e5500-64b:"

diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc
index 364ffac43df8bda37abf8704348ffd88549e1323..c6709c1658cdba6834b25cb2f9a8cf45e28e49cd 100644 (file)
--- a/conf/machine/include/e5500.inc
+++ b/conf/machine/include/e5500.inc
@@ -1,6 +1,6 @@
 TARGET_FPU = "hard"
 
-require conf/machine/include/tune-ppce5500.inc
+require conf/machine/include/powerpc/tune-ppce5500.inc
 require conf/machine/include/qoriq-ppc.inc
 
 MACHINEOVERRIDES =. "e5500:"

diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc
index a94cb3b1c5a0a8a757cd3ac0fa077d0ad343a375..3611d51affcd600519f9205d80c2362f57c29e36 100644 (file)
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -1,7 +1,7 @@
 TARGET_FPU = "hard"
 DEFAULTTUNE ?= "ppc64e6500"
 
-require conf/machine/include/tune-ppce6500.inc
+require conf/machine/include/powerpc/tune-ppce6500.inc
 require conf/machine/include/qoriq-ppc.inc
 
 MACHINEOVERRIDES =. "e6500-64b:"

diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index 771fbe29b082cb9142c7848b7bfa586133ad4b04..565b75ee003de23686ef73923b5d57d6c503a9e1 100644 (file)
--- a/conf/machine/include/e6500.inc
+++ b/conf/machine/include/e6500.inc
@@ -1,6 +1,6 @@
 TARGET_FPU = "hard"
 
-require conf/machine/include/tune-ppce6500.inc
+require conf/machine/include/powerpc/tune-ppce6500.inc
 require conf/machine/include/qoriq-ppc.inc
 
 MACHINEOVERRIDES =. "e6500:"

diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc
index 0cc980e8866a90733fc14ee4ae13ad39d6fc953f..a0006399c20d584b938394ab9f65cdddb87063ac 100644 (file)
--- a/conf/machine/include/imx8dxl-evk.inc
+++ b/conf/machine/include/imx8dxl-evk.inc
@@ -1,7 +1,7 @@
 MACHINEOVERRIDES =. "mx8:mx8x:mx8dxl:"
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa35.inc
+require conf/machine/include/arm/armv8a/tune-cortexa35.inc
 
 IMX_DEFAULT_BSP = "nxp"
 

diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 93f6339b59ef8bf82be9a2b16869733439a8e755..3ea562ff9a5647a799efd3d9e18e403cd5fd0856 100644 (file)
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -1,7 +1,7 @@
 MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mm:"
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa53.inc
+require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 
 MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356"
 

diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index 80205b8f7654890318c64bf7e2ac67f5c1e22da3..3c867473ecdd4deddb92a6ad6f2be4e872677c1d 100644 (file)
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -1,7 +1,7 @@
 MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mn:"
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa53.inc
+require conf/machine/include/arm/armv8a/tune-cortexa53.inc
 
 MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356"
 

diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index cf2850b86a5cf504f351b34ba47efd22d824f44a..9697b3f60d240688032b3778613a2a409123b7a0 100644 (file)
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -1,7 +1,7 @@
 MACHINEOVERRIDES =. "imx-boot-container: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
 
 MACHINE_FEATURES += "pci wifi bluetooth"
 

diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc
index 0bc10b8e3b776af052fb06f620d5093d8a16c622..e6f4f058b0786d1e29d59fae6746b7b7ef895d1f 100644 (file)
--- a/conf/machine/include/imx8x-mek.inc
+++ b/conf/machine/include/imx8x-mek.inc
@@ -1,7 +1,7 @@
 MACHINEOVERRIDES =. "mx8:mx8x:"
 
 require conf/machine/include/imx-base.inc
-require conf/machine/include/tune-cortexa35.inc
+require conf/machine/include/arm/armv8a/tune-cortexa35.inc
 
 IMX_DEFAULT_BSP = "nxp"
 

diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index e4bfb79c353f2c51348061b7e4513def1cf22471..dff6767c445d54dd4038162c764fbf360a790901 100644 (file)
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -8,7 +8,7 @@
 MACHINEOVERRIDES =. "ls102xa:"
 
 require conf/machine/include/qoriq-arm.inc
-require conf/machine/include/tune-cortexa7.inc
+require conf/machine/include/arm/armv7a/tune-cortexa7.inc
 
 MACHINE_FEATURES += "optee"