summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2021-08-18 15:46:54 -0300
committerGitHub <noreply@github.com>2021-08-18 15:46:54 -0300
commit048b8843039864a00a203efacbe91e65ceac0d5a (patch)
tree9dd0fc020a5726353615cd93997562d0059fe493
parentb57b3c3764ed1bb20ed1911e2c0fea0904bed6df (diff)
parent30073ec0c0f29273cb9fa1906c9a2162fae99821 (diff)
downloadmeta-freescale-048b8843039864a00a203efacbe91e65ceac0d5a.tar.gz
Merge pull request #843 from YoeDistro/yoe/mut
machines: Adjust for using new location of tune files from core
-rw-r--r--conf/machine/imx23evk.conf2
-rw-r--r--conf/machine/imx25pdk.conf2
-rw-r--r--conf/machine/imx28evk.conf2
-rw-r--r--conf/machine/imx51evk.conf2
-rw-r--r--conf/machine/imx53ard.conf2
-rw-r--r--conf/machine/imx53qsb.conf2
-rw-r--r--conf/machine/imx6qdlsabreauto.conf2
-rw-r--r--conf/machine/imx6qdlsabresd.conf2
-rw-r--r--conf/machine/imx6slevk.conf2
-rw-r--r--conf/machine/imx6sllevk.conf2
-rw-r--r--conf/machine/imx6sxsabreauto.conf2
-rw-r--r--conf/machine/imx6sxsabresd.conf2
-rw-r--r--conf/machine/imx6ulevk.conf2
-rw-r--r--conf/machine/imx6ullevk.conf2
-rw-r--r--conf/machine/imx6ulz-14x14-evk.conf2
-rw-r--r--conf/machine/imx7dsabresd.conf2
-rw-r--r--conf/machine/imx7ulpevk.conf2
-rw-r--r--conf/machine/imx8mq-evk.conf2
-rw-r--r--conf/machine/imx8qm-mek.conf2
-rw-r--r--conf/machine/include/e500mc.inc2
-rw-r--r--conf/machine/include/e500v2.inc2
-rw-r--r--conf/machine/include/e5500-64b.inc2
-rw-r--r--conf/machine/include/e5500.inc2
-rw-r--r--conf/machine/include/e6500-64b.inc2
-rw-r--r--conf/machine/include/e6500.inc2
-rw-r--r--conf/machine/include/imx8dxl-evk.inc2
-rw-r--r--conf/machine/include/imx8mm-evk.inc2
-rw-r--r--conf/machine/include/imx8mn-evk.inc2
-rw-r--r--conf/machine/include/imx8mp-evk.inc2
-rw-r--r--conf/machine/include/imx8x-mek.inc2
-rw-r--r--conf/machine/ls1021atwr.conf2
31 files changed, 31 insertions, 31 deletions
diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index 8abc5a958..5e8be1e90 100644
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mxs:mx23:" 7MACHINEOVERRIDES =. "mxs:mx23:"
8 8
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/tune-arm926ejs.inc 10include conf/machine/include/arm/armv5/tune-arm926ejs.inc
11 11
12# This machine is not supported by u-boot-imx as it is not tested by NXP on this 12# This machine is not supported by u-boot-imx as it is not tested by NXP on this
13# board. So we force it to use u-boot-fslc which is based on mainline here. 13# 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 5721e845b..2abadb25b 100644
--- a/conf/machine/imx25pdk.conf
+++ b/conf/machine/imx25pdk.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mx25:" 7MACHINEOVERRIDES =. "mx25:"
8 8
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/tune-arm926ejs.inc 10include conf/machine/include/arm/armv5/tune-arm926ejs.inc
11 11
12# This machine is not supported by u-boot-imx as it is not tested by NXP on this 12# This machine is not supported by u-boot-imx as it is not tested by NXP on this
13# board. So we force it to use u-boot-fslc which is based on mainline here. 13# 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 4f69dae4d..9763a3968 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mxs:mx28:" 7MACHINEOVERRIDES =. "mxs:mx28:"
8 8
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/tune-arm926ejs.inc 10include conf/machine/include/arm/armv5/tune-arm926ejs.inc
11 11
12# This machine is not supported by u-boot-imx as it is not tested by NXP on this 12# This machine is not supported by u-boot-imx as it is not tested by NXP on this
13# board. So we force it to use u-boot-fslc which is based on mainline here. 13# 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 80d7b3860..7c66435dc 100644
--- a/conf/machine/imx51evk.conf
+++ b/conf/machine/imx51evk.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mx5:mx51:" 7MACHINEOVERRIDES =. "mx5:mx51:"
8 8
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/tune-cortexa8.inc 10include conf/machine/include/arm/armv7a/tune-cortexa8.inc
11 11
12KERNEL_DEVICETREE = "imx51-babbage.dtb" 12KERNEL_DEVICETREE = "imx51-babbage.dtb"
13 13
diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index af5aeb3bc..b2c65b84f 100644
--- a/conf/machine/imx53ard.conf
+++ b/conf/machine/imx53ard.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mx5:mx53:" 7MACHINEOVERRIDES =. "mx5:mx53:"
8 8
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/tune-cortexa8.inc 10include conf/machine/include/arm/armv7a/tune-cortexa8.inc
11 11
12# Disable perf features as 2.6.35.3 fails to build otherwise 12# Disable perf features as 2.6.35.3 fails to build otherwise
13PERF_FEATURES_ENABLE = "" 13PERF_FEATURES_ENABLE = ""
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index 06d4a7569..0d6a7b225 100644
--- a/conf/machine/imx53qsb.conf
+++ b/conf/machine/imx53qsb.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mx5:mx53:" 7MACHINEOVERRIDES =. "mx5:mx53:"
8 8
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/tune-cortexa8.inc 10include conf/machine/include/arm/armv7a/tune-cortexa8.inc
11 11
12KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb" 12KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb"
13 13
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 0b5274cb8..8069fb3f7 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -14,7 +14,7 @@
14MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:" 14MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:"
15 15
16require conf/machine/include/imx-base.inc 16require conf/machine/include/imx-base.inc
17require conf/machine/include/tune-cortexa9.inc 17require conf/machine/include/arm/armv7a/tune-cortexa9.inc
18 18
19KERNEL_DEVICETREE = " \ 19KERNEL_DEVICETREE = " \
20 imx6qp-sabreauto.dtb imx6qp-sabreauto-ecspi.dtb imx6qp-sabreauto-flexcan1.dtb \ 20 imx6qp-sabreauto.dtb imx6qp-sabreauto-ecspi.dtb imx6qp-sabreauto-flexcan1.dtb \
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 27a2e9d7f..215e01834 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -14,7 +14,7 @@
14MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:" 14MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:"
15 15
16require conf/machine/include/imx-base.inc 16require conf/machine/include/imx-base.inc
17require conf/machine/include/tune-cortexa9.inc 17require conf/machine/include/arm/armv7a/tune-cortexa9.inc
18 18
19KERNEL_DEVICETREE = " \ 19KERNEL_DEVICETREE = " \
20 imx6qp-sabresd-btwifi.dtb \ 20 imx6qp-sabresd-btwifi.dtb \
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index 8bef21b68..b25182ba9 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mx6:mx6sl:" 7MACHINEOVERRIDES =. "mx6:mx6sl:"
8 8
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/tune-cortexa9.inc 10require conf/machine/include/arm/armv7a/tune-cortexa9.inc
11 11
12KERNEL_DEVICETREE = "imx6sl-evk.dtb" 12KERNEL_DEVICETREE = "imx6sl-evk.dtb"
13KERNEL_DEVICETREE:append:use-nxp-bsp = " \ 13KERNEL_DEVICETREE:append:use-nxp-bsp = " \
diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf
index 6282533aa..ea5258454 100644
--- a/conf/machine/imx6sllevk.conf
+++ b/conf/machine/imx6sllevk.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mx6:mx6sll:" 7MACHINEOVERRIDES =. "mx6:mx6sll:"
8 8
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/tune-cortexa9.inc 10require conf/machine/include/arm/armv7a/tune-cortexa9.inc
11 11
12KERNEL_DEVICETREE = "imx6sll-evk.dtb" 12KERNEL_DEVICETREE = "imx6sll-evk.dtb"
13 13
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index 2354635e2..9e83c4580 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mx6:mx6sx:" 7MACHINEOVERRIDES =. "mx6:mx6sx:"
8 8
9require conf/machine/include/imx-base.inc 9require conf/machine/include/imx-base.inc
10require conf/machine/include/tune-cortexa9.inc 10require conf/machine/include/arm/armv7a/tune-cortexa9.inc
11 11
12KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb" 12KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb"
13KERNEL_DEVICETREE:use-mainline-bsp = "imx6sx-sabreauto.dtb" 13KERNEL_DEVICETREE:use-mainline-bsp = "imx6sx-sabreauto.dtb"
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index fcfcbd5f4..d0a89596c 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mx6:mx6sx:" 7MACHINEOVERRIDES =. "mx6:mx6sx:"
8 8
9require conf/machine/include/imx-base.inc 9require conf/machine/include/imx-base.inc
10require conf/machine/include/tune-cortexa9.inc 10require conf/machine/include/arm/armv7a/tune-cortexa9.inc
11 11
12KERNEL_DEVICETREE = " \ 12KERNEL_DEVICETREE = " \
13 imx6sx-sdb.dtb \ 13 imx6sx-sdb.dtb \
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 6fd14456f..09d64b4ef 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mx6:mx6ul:" 7MACHINEOVERRIDES =. "mx6:mx6ul:"
8 8
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/tune-cortexa7.inc 10include conf/machine/include/arm/armv7a/tune-cortexa7.inc
11 11
12MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" 12MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455"
13 13
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index f5b7309fb..e71e34e49 100644
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mx6:mx6ull:" 7MACHINEOVERRIDES =. "mx6:mx6ull:"
8 8
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/tune-cortexa7.inc 10include conf/machine/include/arm/armv7a/tune-cortexa7.inc
11 11
12MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" 12MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455"
13 13
diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf
index a27f1ef11..a47c08f88 100644
--- a/conf/machine/imx6ulz-14x14-evk.conf
+++ b/conf/machine/imx6ulz-14x14-evk.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:mx6ulz:" 7MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:mx6ulz:"
8 8
9include conf/machine/include/imx-base.inc 9include conf/machine/include/imx-base.inc
10include conf/machine/include/tune-cortexa7.inc 10include conf/machine/include/arm/armv7a/tune-cortexa7.inc
11 11
12MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" 12MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455"
13 13
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index 860c8007f..7183d6f94 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mx7:mx7d:" 7MACHINEOVERRIDES =. "mx7:mx7d:"
8 8
9require conf/machine/include/imx-base.inc 9require conf/machine/include/imx-base.inc
10require conf/machine/include/tune-cortexa7.inc 10include conf/machine/include/arm/armv7a/tune-cortexa7.inc
11 11
12MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" 12MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455"
13 13
diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index d685a90ca..e09612407 100644
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mx7:mx7ulp:" 7MACHINEOVERRIDES =. "mx7:mx7ulp:"
8 8
9require conf/machine/include/imx-base.inc 9require conf/machine/include/imx-base.inc
10require conf/machine/include/tune-cortexa7.inc 10include conf/machine/include/arm/armv7a/tune-cortexa7.inc
11 11
12MACHINE_FEATURES += "pci wifi bluetooth bcm43430" 12MACHINE_FEATURES += "pci wifi bluetooth bcm43430"
13 13
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index b6dcd8902..e16bc504e 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -7,7 +7,7 @@
7MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" 7MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:"
8 8
9require conf/machine/include/imx-base.inc 9require conf/machine/include/imx-base.inc
10require conf/machine/include/tune-cortexa53.inc 10require conf/machine/include/arm/armv8a/tune-cortexa53.inc
11 11
12IMX_DEFAULT_BSP = "nxp" 12IMX_DEFAULT_BSP = "nxp"
13 13
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index eb6ceced0..c2e450ce9 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -6,7 +6,7 @@
6MACHINEOVERRIDES =. "mx8:mx8qm:" 6MACHINEOVERRIDES =. "mx8:mx8qm:"
7 7
8require conf/machine/include/imx-base.inc 8require conf/machine/include/imx-base.inc
9require conf/machine/include/tune-cortexa72-cortexa53.inc 9require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc
10 10
11IMX_DEFAULT_BSP = "nxp" 11IMX_DEFAULT_BSP = "nxp"
12 12
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 @@
1TARGET_FPU = "hard" 1TARGET_FPU = "hard"
2 2
3require conf/machine/include/tune-ppce500mc.inc 3require conf/machine/include/powerpc/tune-ppce500mc.inc
4require conf/machine/include/qoriq-ppc.inc 4require conf/machine/include/qoriq-ppc.inc
5 5
6MACHINEOVERRIDES =. "e500mc:" 6MACHINEOVERRIDES =. "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 @@
1require conf/machine/include/tune-ppce500v2.inc 1require conf/machine/include/powerpc/tune-ppce500v2.inc
2 2
3MACHINEOVERRIDES =. "e500v2:" 3MACHINEOVERRIDES =. "e500v2:"
4require conf/machine/include/qoriq-ppc.inc 4require 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 @@
1TARGET_FPU = "hard" 1TARGET_FPU = "hard"
2DEFAULTTUNE ?= "ppc64e5500" 2DEFAULTTUNE ?= "ppc64e5500"
3 3
4require conf/machine/include/tune-ppce5500.inc 4require conf/machine/include/powerpc/tune-ppce5500.inc
5require conf/machine/include/qoriq-ppc.inc 5require conf/machine/include/qoriq-ppc.inc
6 6
7MACHINEOVERRIDES =. "e5500-64b:" 7MACHINEOVERRIDES =. "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 @@
1TARGET_FPU = "hard" 1TARGET_FPU = "hard"
2 2
3require conf/machine/include/tune-ppce5500.inc 3require conf/machine/include/powerpc/tune-ppce5500.inc
4require conf/machine/include/qoriq-ppc.inc 4require conf/machine/include/qoriq-ppc.inc
5 5
6MACHINEOVERRIDES =. "e5500:" 6MACHINEOVERRIDES =. "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 @@
1TARGET_FPU = "hard" 1TARGET_FPU = "hard"
2DEFAULTTUNE ?= "ppc64e6500" 2DEFAULTTUNE ?= "ppc64e6500"
3 3
4require conf/machine/include/tune-ppce6500.inc 4require conf/machine/include/powerpc/tune-ppce6500.inc
5require conf/machine/include/qoriq-ppc.inc 5require conf/machine/include/qoriq-ppc.inc
6 6
7MACHINEOVERRIDES =. "e6500-64b:" 7MACHINEOVERRIDES =. "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 @@
1TARGET_FPU = "hard" 1TARGET_FPU = "hard"
2 2
3require conf/machine/include/tune-ppce6500.inc 3require conf/machine/include/powerpc/tune-ppce6500.inc
4require conf/machine/include/qoriq-ppc.inc 4require conf/machine/include/qoriq-ppc.inc
5 5
6MACHINEOVERRIDES =. "e6500:" 6MACHINEOVERRIDES =. "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 @@
1MACHINEOVERRIDES =. "mx8:mx8x:mx8dxl:" 1MACHINEOVERRIDES =. "mx8:mx8x:mx8dxl:"
2 2
3require conf/machine/include/imx-base.inc 3require conf/machine/include/imx-base.inc
4require conf/machine/include/tune-cortexa35.inc 4require conf/machine/include/arm/armv8a/tune-cortexa35.inc
5 5
6IMX_DEFAULT_BSP = "nxp" 6IMX_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 @@
1MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mm:" 1MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mm:"
2 2
3require conf/machine/include/imx-base.inc 3require conf/machine/include/imx-base.inc
4require conf/machine/include/tune-cortexa53.inc 4require conf/machine/include/arm/armv8a/tune-cortexa53.inc
5 5
6MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" 6MACHINE_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 @@
1MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mn:" 1MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mn:"
2 2
3require conf/machine/include/imx-base.inc 3require conf/machine/include/imx-base.inc
4require conf/machine/include/tune-cortexa53.inc 4require conf/machine/include/arm/armv8a/tune-cortexa53.inc
5 5
6MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356" 6MACHINE_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 @@
1MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mp:" 1MACHINEOVERRIDES =. "imx-boot-container:mx8:mx8m:mx8mp:"
2 2
3require conf/machine/include/imx-base.inc 3require conf/machine/include/imx-base.inc
4require conf/machine/include/tune-cortexa53.inc 4require conf/machine/include/arm/armv8a/tune-cortexa53.inc
5 5
6MACHINE_FEATURES += "pci wifi bluetooth" 6MACHINE_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 @@
1MACHINEOVERRIDES =. "mx8:mx8x:" 1MACHINEOVERRIDES =. "mx8:mx8x:"
2 2
3require conf/machine/include/imx-base.inc 3require conf/machine/include/imx-base.inc
4require conf/machine/include/tune-cortexa35.inc 4require conf/machine/include/arm/armv8a/tune-cortexa35.inc
5 5
6IMX_DEFAULT_BSP = "nxp" 6IMX_DEFAULT_BSP = "nxp"
7 7
diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index e4bfb79c3..dff6767c4 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -8,7 +8,7 @@
8MACHINEOVERRIDES =. "ls102xa:" 8MACHINEOVERRIDES =. "ls102xa:"
9 9
10require conf/machine/include/qoriq-arm.inc 10require conf/machine/include/qoriq-arm.inc
11require conf/machine/include/tune-cortexa7.inc 11require conf/machine/include/arm/armv7a/tune-cortexa7.inc
12 12
13MACHINE_FEATURES += "optee" 13MACHINE_FEATURES += "optee"
14 14