11 files changed, 11 insertions, 11 deletions
diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc
index a33485bea..aa60d95e6 100644
--- 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 420f0343b..a9af67cda 100644
--- 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 f384b34a7..42acb2f24 100644
--- 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 364ffac43..c6709c165 100644
--- 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 a94cb3b1c..3611d51af 100644
--- 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 771fbe29b..565b75ee0 100644
--- 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 0cc980e88..a0006399c 100644
--- 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 93f6339b5..3ea562ff9 100644
--- 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 80205b8f7..3c867473e 100644
--- 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 cf2850b86..9697b3f60 100644
--- 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 0bc10b8e3..e6f4f058b 100644
--- 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/include/e500mc.inc b/conf/machine/include/e500mc.inc index a33485bea..aa60d95e6 100644 --- a/conf/machine/include/e500mc.inc +++ b/conf/machine/include/e500mc.inc
@@ -1,6 +1,6 @@
1	TARGET_FPU = "hard"	1	TARGET_FPU = "hard"
2		2
3	require conf/machine/include/tune-ppce500mc.inc	3	require conf/machine/include/powerpc/tune-ppce500mc.inc
4	require conf/machine/include/qoriq-ppc.inc	4	require conf/machine/include/qoriq-ppc.inc
5		5
6	MACHINEOVERRIDES =. "e500mc:"	6	MACHINEOVERRIDES =. "e500mc:"


diff --git a/conf/machine/include/e500v2.inc b/conf/machine/include/e500v2.inc index 420f0343b..a9af67cda 100644 --- a/conf/machine/include/e500v2.inc +++ b/conf/machine/include/e500v2.inc
@@ -1,4 +1,4 @@
1	require conf/machine/include/tune-ppce500v2.inc	1	require conf/machine/include/powerpc/tune-ppce500v2.inc
2		2
3	MACHINEOVERRIDES =. "e500v2:"	3	MACHINEOVERRIDES =. "e500v2:"
4	require conf/machine/include/qoriq-ppc.inc	4	require conf/machine/include/qoriq-ppc.inc


diff --git a/conf/machine/include/e5500-64b.inc b/conf/machine/include/e5500-64b.inc index f384b34a7..42acb2f24 100644 --- a/conf/machine/include/e5500-64b.inc +++ b/conf/machine/include/e5500-64b.inc
@@ -1,7 +1,7 @@
1	TARGET_FPU = "hard"	1	TARGET_FPU = "hard"
2	DEFAULTTUNE ?= "ppc64e5500"	2	DEFAULTTUNE ?= "ppc64e5500"
3		3
4	require conf/machine/include/tune-ppce5500.inc	4	require conf/machine/include/powerpc/tune-ppce5500.inc
5	require conf/machine/include/qoriq-ppc.inc	5	require conf/machine/include/qoriq-ppc.inc
6		6
7	MACHINEOVERRIDES =. "e5500-64b:"	7	MACHINEOVERRIDES =. "e5500-64b:"


diff --git a/conf/machine/include/e5500.inc b/conf/machine/include/e5500.inc index 364ffac43..c6709c165 100644 --- a/conf/machine/include/e5500.inc +++ b/conf/machine/include/e5500.inc
@@ -1,6 +1,6 @@
1	TARGET_FPU = "hard"	1	TARGET_FPU = "hard"
2		2
3	require conf/machine/include/tune-ppce5500.inc	3	require conf/machine/include/powerpc/tune-ppce5500.inc
4	require conf/machine/include/qoriq-ppc.inc	4	require conf/machine/include/qoriq-ppc.inc
5		5
6	MACHINEOVERRIDES =. "e5500:"	6	MACHINEOVERRIDES =. "e5500:"


diff --git a/conf/machine/include/e6500-64b.inc b/conf/machine/include/e6500-64b.inc index a94cb3b1c..3611d51af 100644 --- a/conf/machine/include/e6500-64b.inc +++ b/conf/machine/include/e6500-64b.inc
@@ -1,7 +1,7 @@
1	TARGET_FPU = "hard"	1	TARGET_FPU = "hard"
2	DEFAULTTUNE ?= "ppc64e6500"	2	DEFAULTTUNE ?= "ppc64e6500"
3		3
4	require conf/machine/include/tune-ppce6500.inc	4	require conf/machine/include/powerpc/tune-ppce6500.inc
5	require conf/machine/include/qoriq-ppc.inc	5	require conf/machine/include/qoriq-ppc.inc
6		6
7	MACHINEOVERRIDES =. "e6500-64b:"	7	MACHINEOVERRIDES =. "e6500-64b:"


diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc index 771fbe29b..565b75ee0 100644 --- a/conf/machine/include/e6500.inc +++ b/conf/machine/include/e6500.inc
@@ -1,6 +1,6 @@
1	TARGET_FPU = "hard"	1	TARGET_FPU = "hard"
2		2
3	require conf/machine/include/tune-ppce6500.inc	3	require conf/machine/include/powerpc/tune-ppce6500.inc
4	require conf/machine/include/qoriq-ppc.inc	4	require conf/machine/include/qoriq-ppc.inc
5		5
6	MACHINEOVERRIDES =. "e6500:"	6	MACHINEOVERRIDES =. "e6500:"


diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc index 0cc980e88..a0006399c 100644 --- a/conf/machine/include/imx8dxl-evk.inc +++ b/conf/machine/include/imx8dxl-evk.inc
@@ -1,7 +1,7 @@
1	MACHINEOVERRIDES =. "mx8:mx8x:mx8dxl:"	1	MACHINEOVERRIDES =. "mx8:mx8x:mx8dxl:"
2		2
3	require conf/machine/include/imx-base.inc	3	require conf/machine/include/imx-base.inc
4	require conf/machine/include/tune-cortexa35.inc	4	require conf/machine/include/arm/armv8a/tune-cortexa35.inc
5		5
6	IMX_DEFAULT_BSP = "nxp"	6	IMX_DEFAULT_BSP = "nxp"
7		7


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


diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index 80205b8f7..3c867473e 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc
@@ -1,7 +1,7 @@
1	MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mn:"	1	MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mn:"
2		2
3	require conf/machine/include/imx-base.inc	3	require conf/machine/include/imx-base.inc
4	require conf/machine/include/tune-cortexa53.inc	4	require conf/machine/include/arm/armv8a/tune-cortexa53.inc
5		5
6	MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356"	6	MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356"
7		7


diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc index cf2850b86..9697b3f60 100644 --- a/conf/machine/include/imx8mp-evk.inc +++ b/conf/machine/include/imx8mp-evk.inc
@@ -1,7 +1,7 @@
1	MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mp:"	1	MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mp:"
2		2
3	require conf/machine/include/imx-base.inc	3	require conf/machine/include/imx-base.inc
4	require conf/machine/include/tune-cortexa53.inc	4	require conf/machine/include/arm/armv8a/tune-cortexa53.inc
5		5
6	MACHINE_FEATURES += "pci wifi bluetooth"	6	MACHINE_FEATURES += "pci wifi bluetooth"
7		7


diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc index 0bc10b8e3..e6f4f058b 100644 --- a/conf/machine/include/imx8x-mek.inc +++ b/conf/machine/include/imx8x-mek.inc
@@ -1,7 +1,7 @@
1	MACHINEOVERRIDES =. "mx8:mx8x:"	1	MACHINEOVERRIDES =. "mx8:mx8x:"
2		2
3	require conf/machine/include/imx-base.inc	3	require conf/machine/include/imx-base.inc
4	require conf/machine/include/tune-cortexa35.inc	4	require conf/machine/include/arm/armv8a/tune-cortexa35.inc
5		5
6	IMX_DEFAULT_BSP = "nxp"	6	IMX_DEFAULT_BSP = "nxp"
7		7