diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-08-17 17:19:42 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-08-18 08:44:17 -0700 |
commit | 30073ec0c0f29273cb9fa1906c9a2162fae99821 (patch) | |
tree | 9dd0fc020a5726353615cd93997562d0059fe493 /conf | |
parent | b57b3c3764ed1bb20ed1911e2c0fea0904bed6df (diff) | |
download | meta-freescale-30073ec0c0f29273cb9fa1906c9a2162fae99821.tar.gz |
machines: Adjust for using new location of tune files from core
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'conf')
31 files changed, 31 insertions, 31 deletions
diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf index 8abc5a95..5e8be1e9 100644 --- a/conf/machine/imx23evk.conf +++ b/conf/machine/imx23evk.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mxs:mx23:" | 7 | MACHINEOVERRIDES =. "mxs:mx23:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/tune-arm926ejs.inc | 10 | include 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 5721e845..2abadb25 100644 --- a/conf/machine/imx25pdk.conf +++ b/conf/machine/imx25pdk.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mx25:" | 7 | MACHINEOVERRIDES =. "mx25:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/tune-arm926ejs.inc | 10 | include 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 4f69dae4..9763a396 100644 --- a/conf/machine/imx28evk.conf +++ b/conf/machine/imx28evk.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mxs:mx28:" | 7 | MACHINEOVERRIDES =. "mxs:mx28:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/tune-arm926ejs.inc | 10 | include 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 80d7b386..7c66435d 100644 --- a/conf/machine/imx51evk.conf +++ b/conf/machine/imx51evk.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mx5:mx51:" | 7 | MACHINEOVERRIDES =. "mx5:mx51:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/tune-cortexa8.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa8.inc |
11 | 11 | ||
12 | KERNEL_DEVICETREE = "imx51-babbage.dtb" | 12 | KERNEL_DEVICETREE = "imx51-babbage.dtb" |
13 | 13 | ||
diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf index af5aeb3b..b2c65b84 100644 --- a/conf/machine/imx53ard.conf +++ b/conf/machine/imx53ard.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mx5:mx53:" | 7 | MACHINEOVERRIDES =. "mx5:mx53:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/tune-cortexa8.inc | 10 | include 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 |
13 | PERF_FEATURES_ENABLE = "" | 13 | PERF_FEATURES_ENABLE = "" |
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf index 06d4a756..0d6a7b22 100644 --- a/conf/machine/imx53qsb.conf +++ b/conf/machine/imx53qsb.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mx5:mx53:" | 7 | MACHINEOVERRIDES =. "mx5:mx53:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/tune-cortexa8.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa8.inc |
11 | 11 | ||
12 | KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb" | 12 | KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb" |
13 | 13 | ||
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index 0b5274cb..8069fb3f 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf | |||
@@ -14,7 +14,7 @@ | |||
14 | MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:" | 14 | MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:" |
15 | 15 | ||
16 | require conf/machine/include/imx-base.inc | 16 | require conf/machine/include/imx-base.inc |
17 | require conf/machine/include/tune-cortexa9.inc | 17 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc |
18 | 18 | ||
19 | KERNEL_DEVICETREE = " \ | 19 | KERNEL_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 27a2e9d7..215e0183 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf | |||
@@ -14,7 +14,7 @@ | |||
14 | MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:" | 14 | MACHINEOVERRIDES =. "mx6:mx6q:mx6dl:" |
15 | 15 | ||
16 | require conf/machine/include/imx-base.inc | 16 | require conf/machine/include/imx-base.inc |
17 | require conf/machine/include/tune-cortexa9.inc | 17 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc |
18 | 18 | ||
19 | KERNEL_DEVICETREE = " \ | 19 | KERNEL_DEVICETREE = " \ |
20 | imx6qp-sabresd-btwifi.dtb \ | 20 | imx6qp-sabresd-btwifi.dtb \ |
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf index 8bef21b6..b25182ba 100644 --- a/conf/machine/imx6slevk.conf +++ b/conf/machine/imx6slevk.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mx6:mx6sl:" | 7 | MACHINEOVERRIDES =. "mx6:mx6sl:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/tune-cortexa9.inc | 10 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc |
11 | 11 | ||
12 | KERNEL_DEVICETREE = "imx6sl-evk.dtb" | 12 | KERNEL_DEVICETREE = "imx6sl-evk.dtb" |
13 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ | 13 | KERNEL_DEVICETREE:append:use-nxp-bsp = " \ |
diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf index 6282533a..ea525845 100644 --- a/conf/machine/imx6sllevk.conf +++ b/conf/machine/imx6sllevk.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mx6:mx6sll:" | 7 | MACHINEOVERRIDES =. "mx6:mx6sll:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/tune-cortexa9.inc | 10 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc |
11 | 11 | ||
12 | KERNEL_DEVICETREE = "imx6sll-evk.dtb" | 12 | KERNEL_DEVICETREE = "imx6sll-evk.dtb" |
13 | 13 | ||
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf index 2354635e..9e83c458 100644 --- a/conf/machine/imx6sxsabreauto.conf +++ b/conf/machine/imx6sxsabreauto.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mx6:mx6sx:" | 7 | MACHINEOVERRIDES =. "mx6:mx6sx:" |
8 | 8 | ||
9 | require conf/machine/include/imx-base.inc | 9 | require conf/machine/include/imx-base.inc |
10 | require conf/machine/include/tune-cortexa9.inc | 10 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc |
11 | 11 | ||
12 | KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb" | 12 | KERNEL_DEVICETREE = "imx6sx-sabreauto.dtb" |
13 | KERNEL_DEVICETREE:use-mainline-bsp = "imx6sx-sabreauto.dtb" | 13 | KERNEL_DEVICETREE:use-mainline-bsp = "imx6sx-sabreauto.dtb" |
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf index fcfcbd5f..d0a89596 100644 --- a/conf/machine/imx6sxsabresd.conf +++ b/conf/machine/imx6sxsabresd.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mx6:mx6sx:" | 7 | MACHINEOVERRIDES =. "mx6:mx6sx:" |
8 | 8 | ||
9 | require conf/machine/include/imx-base.inc | 9 | require conf/machine/include/imx-base.inc |
10 | require conf/machine/include/tune-cortexa9.inc | 10 | require conf/machine/include/arm/armv7a/tune-cortexa9.inc |
11 | 11 | ||
12 | KERNEL_DEVICETREE = " \ | 12 | KERNEL_DEVICETREE = " \ |
13 | imx6sx-sdb.dtb \ | 13 | imx6sx-sdb.dtb \ |
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index 6fd14456..09d64b4e 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mx6:mx6ul:" | 7 | MACHINEOVERRIDES =. "mx6:mx6ul:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
11 | 11 | ||
12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" | 12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" |
13 | 13 | ||
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf index f5b7309f..e71e34e4 100644 --- a/conf/machine/imx6ullevk.conf +++ b/conf/machine/imx6ullevk.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mx6:mx6ull:" | 7 | MACHINEOVERRIDES =. "mx6:mx6ull:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
11 | 11 | ||
12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" | 12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" |
13 | 13 | ||
diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf index a27f1ef1..a47c08f8 100644 --- a/conf/machine/imx6ulz-14x14-evk.conf +++ b/conf/machine/imx6ulz-14x14-evk.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:mx6ulz:" | 7 | MACHINEOVERRIDES =. "mx6:mx6ul:mx6ull:mx6ulz:" |
8 | 8 | ||
9 | include conf/machine/include/imx-base.inc | 9 | include conf/machine/include/imx-base.inc |
10 | include conf/machine/include/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
11 | 11 | ||
12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" | 12 | MACHINE_FEATURES += "wifi bluetooth bcm4339 bcm43455" |
13 | 13 | ||
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf index 860c8007..7183d6f9 100644 --- a/conf/machine/imx7dsabresd.conf +++ b/conf/machine/imx7dsabresd.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mx7:mx7d:" | 7 | MACHINEOVERRIDES =. "mx7:mx7d:" |
8 | 8 | ||
9 | require conf/machine/include/imx-base.inc | 9 | require conf/machine/include/imx-base.inc |
10 | require conf/machine/include/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
11 | 11 | ||
12 | MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" | 12 | MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" |
13 | 13 | ||
diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf index d685a90c..e0961240 100644 --- a/conf/machine/imx7ulpevk.conf +++ b/conf/machine/imx7ulpevk.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mx7:mx7ulp:" | 7 | MACHINEOVERRIDES =. "mx7:mx7ulp:" |
8 | 8 | ||
9 | require conf/machine/include/imx-base.inc | 9 | require conf/machine/include/imx-base.inc |
10 | require conf/machine/include/tune-cortexa7.inc | 10 | include conf/machine/include/arm/armv7a/tune-cortexa7.inc |
11 | 11 | ||
12 | MACHINE_FEATURES += "pci wifi bluetooth bcm43430" | 12 | MACHINE_FEATURES += "pci wifi bluetooth bcm43430" |
13 | 13 | ||
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf index b6dcd890..e16bc504 100644 --- a/conf/machine/imx8mq-evk.conf +++ b/conf/machine/imx8mq-evk.conf | |||
@@ -7,7 +7,7 @@ | |||
7 | MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" | 7 | MACHINEOVERRIDES =. "mx8:mx8m:mx8mq:" |
8 | 8 | ||
9 | require conf/machine/include/imx-base.inc | 9 | require conf/machine/include/imx-base.inc |
10 | require conf/machine/include/tune-cortexa53.inc | 10 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc |
11 | 11 | ||
12 | IMX_DEFAULT_BSP = "nxp" | 12 | IMX_DEFAULT_BSP = "nxp" |
13 | 13 | ||
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf index eb6ceced..c2e450ce 100644 --- a/conf/machine/imx8qm-mek.conf +++ b/conf/machine/imx8qm-mek.conf | |||
@@ -6,7 +6,7 @@ | |||
6 | MACHINEOVERRIDES =. "mx8:mx8qm:" | 6 | MACHINEOVERRIDES =. "mx8:mx8qm:" |
7 | 7 | ||
8 | require conf/machine/include/imx-base.inc | 8 | require conf/machine/include/imx-base.inc |
9 | require conf/machine/include/tune-cortexa72-cortexa53.inc | 9 | require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc |
10 | 10 | ||
11 | IMX_DEFAULT_BSP = "nxp" | 11 | IMX_DEFAULT_BSP = "nxp" |
12 | 12 | ||
diff --git a/conf/machine/include/e500mc.inc b/conf/machine/include/e500mc.inc index a33485be..aa60d95e 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 420f0343..a9af67cd 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 f384b34a..42acb2f2 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 364ffac4..c6709c16 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 a94cb3b1..3611d51a 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 771fbe29..565b75ee 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 0cc980e8..a0006399 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 93f6339b..3ea562ff 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 80205b8f..3c867473 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 cf2850b8..9697b3f6 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 0bc10b8e..e6f4f058 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 | ||
diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf index e4bfb79c..dff6767c 100644 --- a/conf/machine/ls1021atwr.conf +++ b/conf/machine/ls1021atwr.conf | |||
@@ -8,7 +8,7 @@ | |||
8 | MACHINEOVERRIDES =. "ls102xa:" | 8 | MACHINEOVERRIDES =. "ls102xa:" |
9 | 9 | ||
10 | require conf/machine/include/qoriq-arm.inc | 10 | require conf/machine/include/qoriq-arm.inc |
11 | require conf/machine/include/tune-cortexa7.inc | 11 | require conf/machine/include/arm/armv7a/tune-cortexa7.inc |
12 | 12 | ||
13 | MACHINE_FEATURES += "optee" | 13 | MACHINE_FEATURES += "optee" |
14 | 14 | ||