summaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'conf/machine')
-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.conf34
-rw-r--r--conf/machine/imx6qdlsabresd.conf31
-rw-r--r--conf/machine/imx6slevk.conf4
-rw-r--r--conf/machine/imx6sllevk.conf4
-rw-r--r--conf/machine/imx6sxsabreauto.conf6
-rw-r--r--conf/machine/imx6sxsabresd.conf6
-rw-r--r--conf/machine/imx6ulevk.conf14
-rw-r--r--conf/machine/imx6ullevk.conf4
-rw-r--r--conf/machine/imx6ulz-14x14-evk.conf4
-rw-r--r--conf/machine/imx7dsabresd.conf4
-rw-r--r--conf/machine/imx7ulpevk.conf6
-rw-r--r--conf/machine/imx8dxl-lpddr4-evk.conf2
-rw-r--r--conf/machine/imx8mm-ddr4-evk.conf2
-rw-r--r--conf/machine/imx8mm-lpddr4-evk.conf2
-rw-r--r--conf/machine/imx8mn-ddr4-evk.conf2
-rw-r--r--conf/machine/imx8mn-lpddr4-evk.conf2
-rw-r--r--conf/machine/imx8mp-ddr4-evk.conf2
-rw-r--r--conf/machine/imx8mp-lpddr4-evk.conf11
-rw-r--r--conf/machine/imx8mq-evk.conf21
-rw-r--r--conf/machine/imx8qm-mek.conf12
-rw-r--r--conf/machine/imx8qxp-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.inc4
-rw-r--r--conf/machine/include/e5500.inc2
-rw-r--r--conf/machine/include/e6500-64b.inc4
-rw-r--r--conf/machine/include/e6500.inc4
-rw-r--r--conf/machine/include/imx-base.inc365
-rw-r--r--conf/machine/include/imx8dxl-evk.inc8
-rw-r--r--conf/machine/include/imx8mm-evk.inc35
-rw-r--r--conf/machine/include/imx8mn-evk.inc33
-rw-r--r--conf/machine/include/imx8mp-evk.inc31
-rw-r--r--conf/machine/include/imx8x-mek.inc10
-rw-r--r--conf/machine/include/qoriq-base.inc10
-rw-r--r--conf/machine/include/utilities.inc2
-rw-r--r--conf/machine/ls1021atwr.conf2
-rw-r--r--conf/machine/ls1028ardb.conf2
-rw-r--r--conf/machine/ls1043ardb.conf2
-rw-r--r--conf/machine/ls1046afrwy.conf2
-rw-r--r--conf/machine/ls1046ardb.conf2
46 files changed, 373 insertions, 336 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 b7aec8c25..171b9f00d 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 \
@@ -26,34 +26,46 @@ KERNEL_DEVICETREE = " \
26 imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \ 26 imx6dl-sabreauto.dtb imx6dl-sabreauto-gpmi-weim.dtb imx6dl-sabreauto-ecspi.dtb \
27 imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb \ 27 imx6dl-sabreauto-flexcan1.dtb imx6dl-sabreauto-enetirq.dtb \
28" 28"
29KERNEL_DEVICETREE_use-mainline-bsp = " \ 29KERNEL_DEVICETREE:use-mainline-bsp = " \
30 imx6qp-sabreauto.dtb \ 30 imx6qp-sabreauto.dtb \
31 imx6q-sabreauto.dtb \ 31 imx6q-sabreauto.dtb \
32 imx6dl-sabreauto.dtb \ 32 imx6dl-sabreauto.dtb \
33" 33"
34 34
35### u-boot-fslc settings ### 35### u-boot-fslc settings ###
36 36SPL_BINARY:pn-u-boot-fslc = "SPL"
37SPL_BINARY_pn-u-boot-fslc = "SPL" 37UBOOT_CONFIG:pn-u-boot-fslc ??= "sd-fslc"
38UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabreauto_defconfig" 38UBOOT_SUFFIX:pn-u-boot-fslc = "img"
39UBOOT_SUFFIX_pn-u-boot-fslc = "img"
40 39
41### u-boot-imx settings ### 40### u-boot-imx settings ###
41SPL_BINARY:pn-u-boot-imx = ""
42UBOOT_CONFIG:pn-u-boot-imx ??= " \
43 sd-imx \
44 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee-imx', '', d)} \
45"
46UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
47UBOOT_SUFFIX:pn-u-boot-imx = "imx"
42 48
43# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC 49# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
44# variants. Change the defconfig to the targeted SoC variant. 50# variants. Change the defconfig to the targeted SoC variant.
45SPL_BINARY_pn-u-boot-imx = "" 51UBOOT_CONFIG[sd-fslc] = "mx6sabreauto_defconfig,sdcard"
46UBOOT_MACHINE_pn-u-boot-imx = "mx6qsabreauto_defconfig" 52UBOOT_CONFIG[sd-imx] = "mx6qpsabreauto_defconfig,sdcard"
47UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx" 53UBOOT_CONFIG[sd-optee-imx] = "mx6qpsabreauto_optee_defconfig,sdcard"
48UBOOT_SUFFIX_pn-u-boot-imx = "imx" 54UBOOT_CONFIG[eimnor-imx] = "mx6qpsabreauto_eimnor_defconfig"
55UBOOT_CONFIG[nand-imx] = "mx6qpsabreauto_nand_defconfig,ubifs"
56UBOOT_CONFIG[spinor-imx] = "mx6qpsabreauto_spinor_defconfig"
57UBOOT_CONFIG[sata-imx] = "mx6qpsabreauto_sata_defconfig"
58UBOOT_CONFIG[mfgtool-imx] = "mx6qpsabreauto_defconfig"
49 59
50WKS_FILE = " \ 60WKS_FILE = " \
51 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ 61 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
52 'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \ 62 'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \
53 'imx-uboot-bootpart.wks.in', d)}" 63 'imx-uboot-bootpart.wks.in', d)}"
54 64
65OPTEE_BIN_EXT = "6qpauto"
66
55SERIAL_CONSOLES = "115200;ttymxc3" 67SERIAL_CONSOLES = "115200;ttymxc3"
56 68
57MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" 69MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
58 70
59MACHINE_FEATURES += " pci wifi bluetooth" 71MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index b3d09e939..a51336259 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 \
@@ -35,34 +35,43 @@ KERNEL_DEVICETREE = " \
35 imx6dl-sabresd-hdcp.dtb \ 35 imx6dl-sabresd-hdcp.dtb \
36 imx6dl-sabresd-ldo.dtb \ 36 imx6dl-sabresd-ldo.dtb \
37" 37"
38KERNEL_DEVICETREE_use-mainline-bsp = " \ 38KERNEL_DEVICETREE:use-mainline-bsp = " \
39 imx6qp-sabresd.dtb \ 39 imx6qp-sabresd.dtb \
40 imx6q-sabresd.dtb \ 40 imx6q-sabresd.dtb \
41 imx6dl-sabresd.dtb \ 41 imx6dl-sabresd.dtb \
42" 42"
43 43
44### u-boot-fslc settings ### 44### u-boot-fslc settings ###
45 45SPL_BINARY:pn-u-boot-fslc = "SPL"
46SPL_BINARY_pn-u-boot-fslc = "SPL" 46UBOOT_CONFIG:pn-u-boot-fslc ??= "sd-fslc"
47UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabresd_defconfig" 47UBOOT_SUFFIX:pn-u-boot-fslc = "img"
48UBOOT_SUFFIX_pn-u-boot-fslc = "img"
49 48
50### u-boot-imx settings ### 49### u-boot-imx settings ###
50SPL_BINARY:pn-u-boot-imx = ""
51UBOOT_CONFIG:pn-u-boot-imx ??= " \
52 sd-imx \
53 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee-imx', '', d)} \
54"
55UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
56UBOOT_SUFFIX:pn-u-boot-imx = "imx"
51 57
52# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC 58# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
53# variants. Change the defconfig to the targeted SoC variant. 59# variants. Change the defconfig to the targeted SoC variant.
54SPL_BINARY_pn-u-boot-imx = "" 60UBOOT_CONFIG[sd-fslc] = "mx6sabresd_defconfig,sdcard"
55UBOOT_MACHINE_pn-u-boot-imx ?= "mx6qsabresd_defconfig" 61UBOOT_CONFIG[sd-imx] = "mx6qsabresd_defconfig,sdcard"
56UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx" 62UBOOT_CONFIG[sd-optee-imx] = "mx6qsabresd_optee_defconfig,sdcard"
57UBOOT_SUFFIX_pn-u-boot-imx = "imx" 63UBOOT_CONFIG[sata-imx] = "mx6qsabresd_sata_defconfig"
64UBOOT_CONFIG[mfgtool-imx] = "mx6qsabresd_defconfig"
58 65
59WKS_FILE = " \ 66WKS_FILE = " \
60 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ 67 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
61 'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \ 68 'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \
62 'imx-uboot-bootpart.wks.in', d)}" 69 'imx-uboot-bootpart.wks.in', d)}"
63 70
71OPTEE_BIN_EXT = "6qsdb"
72
64SERIAL_CONSOLES = "115200;ttymxc0" 73SERIAL_CONSOLES = "115200;ttymxc0"
65 74
66MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" 75MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
67 76
68MACHINE_FEATURES += " pci wifi bluetooth" 77MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index 1e8c403b7..b25182ba9 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -7,10 +7,10 @@
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 = " \
14 imx6sl-evk-btwifi.dtb \ 14 imx6sl-evk-btwifi.dtb \
15 imx6sl-evk-csi.dtb \ 15 imx6sl-evk-csi.dtb \
16 imx6sl-evk-ldo.dtb \ 16 imx6sl-evk-ldo.dtb \
diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf
index 30b537f18..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
@@ -23,7 +23,7 @@ UBOOT_CONFIG[sd-optee] = "mx6sllevk_optee_config,sdcard"
23UBOOT_CONFIG[epdc] = "mx6sllevk_epdc_config" 23UBOOT_CONFIG[epdc] = "mx6sllevk_epdc_config"
24UBOOT_CONFIG[mfgtool] = "mx6sllevk_config" 24UBOOT_CONFIG[mfgtool] = "mx6sllevk_config"
25 25
26OPTEE_BIN_EXT_imx6sllevk = "6sllevk" 26OPTEE_BIN_EXT:imx6sllevk = "6sllevk"
27 27
28SERIAL_CONSOLES = "115200;ttymxc0" 28SERIAL_CONSOLES = "115200;ttymxc0"
29 29
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index f7031ccb1..9e83c4580 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -7,10 +7,10 @@
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"
14 14
15UBOOT_MAKE_TARGET = "u-boot.imx" 15UBOOT_MAKE_TARGET = "u-boot.imx"
16UBOOT_SUFFIX = "imx" 16UBOOT_SUFFIX = "imx"
@@ -29,6 +29,6 @@ OPTEE_BIN_EXT = "6sxauto"
29 29
30SERIAL_CONSOLES = "115200;ttymxc3" 30SERIAL_CONSOLES = "115200;ttymxc3"
31 31
32MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" 32MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
33 33
34MACHINE_FEATURES += " pci wifi bluetooth" 34MACHINE_FEATURES += " pci wifi bluetooth"
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index ff7d6ae62..d0a89596c 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -7,14 +7,14 @@
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 \
14 imx6sx-sdb-reva.dtb \ 14 imx6sx-sdb-reva.dtb \
15 imx6sx-sdb-sai.dtb \ 15 imx6sx-sdb-sai.dtb \
16" 16"
17KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 17KERNEL_DEVICETREE:append:use-nxp-bsp = " \
18 imx6sx-sdb-btwifi.dtb \ 18 imx6sx-sdb-btwifi.dtb \
19 imx6sx-sdb-emmc.dtb \ 19 imx6sx-sdb-emmc.dtb \
20 imx6sx-sdb-lcdif1.dtb \ 20 imx6sx-sdb-lcdif1.dtb \
@@ -43,6 +43,6 @@ OPTEE_BIN_EXT = "6sxsdb"
43 43
44SERIAL_CONSOLES = "115200;ttymxc0" 44SERIAL_CONSOLES = "115200;ttymxc0"
45 45
46MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" 46MACHINE_FIRMWARE:append:mx6 = " linux-firmware-ath6k"
47 47
48MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455" 48MACHINE_FEATURES += "pci wifi bluetooth bcm4339 bcm43455"
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index f7c5d8ae5..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
@@ -21,19 +21,19 @@ KERNEL_DEVICETREE = " \
21 imx6ul-14x14-evk-emmc.dtb \ 21 imx6ul-14x14-evk-emmc.dtb \
22 imx6ul-14x14-evk-gpmi-weim.dtb \ 22 imx6ul-14x14-evk-gpmi-weim.dtb \
23" 23"
24KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb" 24KERNEL_DEVICETREE:use-mainline-bsp = "imx6ul-14x14-evk.dtb"
25 25
26### u-boot-fslc settings ### 26### u-boot-fslc settings ###
27 27
28SPL_BINARY_pn-u-boot-fslc = "SPL" 28SPL_BINARY:pn-u-boot-fslc = "SPL"
29UBOOT_SUFFIX_pn-u-boot-fslc = "img" 29UBOOT_SUFFIX:pn-u-boot-fslc = "img"
30 30
31### u-boot-imx settings ### 31### u-boot-imx settings ###
32 32
33# The u-boot-imx does not provide SPL support 33# The u-boot-imx does not provide SPL support
34SPL_BINARY_pn-u-boot-imx = "" 34SPL_BINARY:pn-u-boot-imx = ""
35UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx" 35UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
36UBOOT_SUFFIX_pn-u-boot-imx = "imx" 36UBOOT_SUFFIX:pn-u-boot-imx = "imx"
37 37
38WKS_FILE = " \ 38WKS_FILE = " \
39 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \ 39 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index bd592a20b..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
@@ -15,7 +15,7 @@ KERNEL_DEVICETREE = " \
15 imx6ull-14x14-evk.dtb \ 15 imx6ull-14x14-evk.dtb \
16" 16"
17 17
18KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 18KERNEL_DEVICETREE:append:use-nxp-bsp = " \
19 imx6ull-14x14-evk-btwifi.dtb \ 19 imx6ull-14x14-evk-btwifi.dtb \
20 imx6ull-14x14-evk-btwifi-oob.dtb \ 20 imx6ull-14x14-evk-btwifi-oob.dtb \
21 imx6ull-14x14-evk-emmc.dtb \ 21 imx6ull-14x14-evk-emmc.dtb \
diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf
index 7b794e7cc..a47c08f88 100644
--- a/conf/machine/imx6ulz-14x14-evk.conf
+++ b/conf/machine/imx6ulz-14x14-evk.conf
@@ -7,14 +7,14 @@
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
14KERNEL_DEVICETREE = " \ 14KERNEL_DEVICETREE = " \
15 imx6ulz-14x14-evk.dtb \ 15 imx6ulz-14x14-evk.dtb \
16" 16"
17KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 17KERNEL_DEVICETREE:append:use-nxp-bsp = " \
18 imx6ulz-14x14-evk-btwifi.dtb \ 18 imx6ulz-14x14-evk-btwifi.dtb \
19 imx6ulz-14x14-evk-emmc.dtb \ 19 imx6ulz-14x14-evk-emmc.dtb \
20 imx6ulz-14x14-evk-gpmi-weim.dtb \ 20 imx6ulz-14x14-evk-gpmi-weim.dtb \
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index e848f2943..7183d6f94 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -7,12 +7,12 @@
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
14KERNEL_DEVICETREE = "imx7d-sdb.dtb" 14KERNEL_DEVICETREE = "imx7d-sdb.dtb"
15KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 15KERNEL_DEVICETREE:append:use-nxp-bsp = " \
16 imx7d-sdb-epdc.dtb \ 16 imx7d-sdb-epdc.dtb \
17 imx7d-sdb-gpmi-weim.dtb \ 17 imx7d-sdb-gpmi-weim.dtb \
18 imx7d-sdb-m4.dtb \ 18 imx7d-sdb-m4.dtb \
diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index a587f44b3..e09612407 100644
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -7,17 +7,17 @@
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
14KERNEL_DEVICETREE = " \ 14KERNEL_DEVICETREE = " \
15 imx7ulp-evk.dtb \ 15 imx7ulp-evk.dtb \
16" 16"
17KERNEL_DEVICETREE_append_use-mainline-bsp = " \ 17KERNEL_DEVICETREE:append:use-mainline-bsp = " \
18 imx7ulp-com.dtb \ 18 imx7ulp-com.dtb \
19" 19"
20KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 20KERNEL_DEVICETREE:append:use-nxp-bsp = " \
21 imx7ulp-evk-ft5416.dtb \ 21 imx7ulp-evk-ft5416.dtb \
22 imx7ulp-evk-mipi.dtb \ 22 imx7ulp-evk-mipi.dtb \
23 imx7ulp-evkb.dtb \ 23 imx7ulp-evkb.dtb \
diff --git a/conf/machine/imx8dxl-lpddr4-evk.conf b/conf/machine/imx8dxl-lpddr4-evk.conf
index 1ea5260bb..d44a47321 100644
--- a/conf/machine/imx8dxl-lpddr4-evk.conf
+++ b/conf/machine/imx8dxl-lpddr4-evk.conf
@@ -5,7 +5,7 @@
5 5
6require conf/machine/include/imx8dxl-evk.inc 6require conf/machine/include/imx8dxl-evk.inc
7KERNEL_DEVICETREE_BASENAME = "imx8dxl-evk" 7KERNEL_DEVICETREE_BASENAME = "imx8dxl-evk"
8KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 8KERNEL_DEVICETREE:append:use-nxp-bsp = " \
9 freescale/${KERNEL_DEVICETREE_BASENAME}-enet0.dtb \ 9 freescale/${KERNEL_DEVICETREE_BASENAME}-enet0.dtb \
10 freescale/${KERNEL_DEVICETREE_BASENAME}-enet0-tja1100.dtb \ 10 freescale/${KERNEL_DEVICETREE_BASENAME}-enet0-tja1100.dtb \
11 freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ 11 freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
diff --git a/conf/machine/imx8mm-ddr4-evk.conf b/conf/machine/imx8mm-ddr4-evk.conf
index 3901bb92c..f21cc3814 100644
--- a/conf/machine/imx8mm-ddr4-evk.conf
+++ b/conf/machine/imx8mm-ddr4-evk.conf
@@ -7,7 +7,7 @@
7require include/imx8mm-evk.inc 7require include/imx8mm-evk.inc
8 8
9KERNEL_DEVICETREE_BASENAME = "${MACHINE}" 9KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
10KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 10KERNEL_DEVICETREE:append:use-nxp-bsp = " \
11 freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191.dtb \ 11 freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191.dtb \
12 freescale/${KERNEL_DEVICETREE_BASENAME}-revb.dtb \ 12 freescale/${KERNEL_DEVICETREE_BASENAME}-revb.dtb \
13" 13"
diff --git a/conf/machine/imx8mm-lpddr4-evk.conf b/conf/machine/imx8mm-lpddr4-evk.conf
index 6007c5404..0a85ed20a 100644
--- a/conf/machine/imx8mm-lpddr4-evk.conf
+++ b/conf/machine/imx8mm-lpddr4-evk.conf
@@ -8,7 +8,7 @@ require include/imx8mm-evk.inc
8 8
9# The device tree name is implicit for LPDDR4, so can't use MACHINE here 9# The device tree name is implicit for LPDDR4, so can't use MACHINE here
10KERNEL_DEVICETREE_BASENAME = "imx8mm-evk" 10KERNEL_DEVICETREE_BASENAME = "imx8mm-evk"
11KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 11KERNEL_DEVICETREE:append:use-nxp-bsp = " \
12 freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ 12 freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \
13 freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \ 13 freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-swpdm.dtb \
14 freescale/${KERNEL_DEVICETREE_BASENAME}-ak4497.dtb \ 14 freescale/${KERNEL_DEVICETREE_BASENAME}-ak4497.dtb \
diff --git a/conf/machine/imx8mn-ddr4-evk.conf b/conf/machine/imx8mn-ddr4-evk.conf
index 442afdbd0..d004d2aec 100644
--- a/conf/machine/imx8mn-ddr4-evk.conf
+++ b/conf/machine/imx8mn-ddr4-evk.conf
@@ -7,7 +7,7 @@
7require include/imx8mn-evk.inc 7require include/imx8mn-evk.inc
8 8
9KERNEL_DEVICETREE_BASENAME = "${MACHINE}" 9KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
10KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 10KERNEL_DEVICETREE:append:use-nxp-bsp = " \
11 freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \ 11 freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \
12" 12"
13UBOOT_CONFIG_BASENAME = "imx8mn_ddr4_evk" 13UBOOT_CONFIG_BASENAME = "imx8mn_ddr4_evk"
diff --git a/conf/machine/imx8mn-lpddr4-evk.conf b/conf/machine/imx8mn-lpddr4-evk.conf
index 7c58bc19f..2e5e6be9a 100644
--- a/conf/machine/imx8mn-lpddr4-evk.conf
+++ b/conf/machine/imx8mn-lpddr4-evk.conf
@@ -8,7 +8,7 @@ require include/imx8mn-evk.inc
8 8
9# The device tree name is implicit for LPDDR4, so can't use MACHINE here 9# The device tree name is implicit for LPDDR4, so can't use MACHINE here
10KERNEL_DEVICETREE_BASENAME = "imx8mn-evk" 10KERNEL_DEVICETREE_BASENAME = "imx8mn-evk"
11KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 11KERNEL_DEVICETREE:append:use-nxp-bsp = " \
12 freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \ 12 freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-revE.dtb \
13" 13"
14UBOOT_CONFIG_BASENAME = "imx8mn_evk" 14UBOOT_CONFIG_BASENAME = "imx8mn_evk"
diff --git a/conf/machine/imx8mp-ddr4-evk.conf b/conf/machine/imx8mp-ddr4-evk.conf
index 09517769f..78e0c1608 100644
--- a/conf/machine/imx8mp-ddr4-evk.conf
+++ b/conf/machine/imx8mp-ddr4-evk.conf
@@ -8,7 +8,7 @@ require include/imx8mp-evk.inc
8 8
9# FIXME: This machine is not yet supported by u-boot-fslc, so for now 9# FIXME: This machine is not yet supported by u-boot-fslc, so for now
10# use u-boot-imx for mainline. 10# use u-boot-imx for mainline.
11IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-imx" 11IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-imx"
12 12
13KERNEL_DEVICETREE_BASENAME = "${MACHINE}" 13KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
14 14
diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf
index cf926c08d..0b7c68010 100644
--- a/conf/machine/imx8mp-lpddr4-evk.conf
+++ b/conf/machine/imx8mp-lpddr4-evk.conf
@@ -11,27 +11,32 @@ KERNEL_DEVICETREE_BASENAME = "imx8mp-evk"
11 11
12# NXP kernel has additional DTB files for various board configuration and 12# NXP kernel has additional DTB files for various board configuration and
13# derivates. Include them here for NXP BSP only 13# derivates. Include them here for NXP BSP only
14KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 14KERNEL_DEVICETREE:append:use-nxp-bsp = " \
15 freescale/imx8mp-ab2.dtb \ 15 freescale/imx8mp-ab2.dtb \
16 freescale/imx8mp-evk-basler.dtb \ 16 freescale/imx8mp-evk-basler.dtb \
17 freescale/imx8mp-evk-basler-ov2775.dtb \ 17 freescale/imx8mp-evk-basler-ov2775.dtb \
18 freescale/imx8mp-evk-basler-ov5640.dtb \ 18 freescale/imx8mp-evk-basler-ov5640.dtb \
19 freescale/imx8mp-evk-dsp.dtb \
20 freescale/imx8mp-evk-dsp-lpa.dtb \
21 freescale/imx8mp-evk-dual-basler.dtb \ 19 freescale/imx8mp-evk-dual-basler.dtb \
22 freescale/imx8mp-evk-dual-ov2775.dtb \ 20 freescale/imx8mp-evk-dual-ov2775.dtb \
21 freescale/imx8mp-evk-ecspi-slave.dtb \
23 freescale/imx8mp-evk-flexcan2.dtb \ 22 freescale/imx8mp-evk-flexcan2.dtb \
23 freescale/imx8mp-evk-hifiberry-dacplus.dtb \
24 freescale/imx8mp-evk-inmate.dtb \ 24 freescale/imx8mp-evk-inmate.dtb \
25 freescale/imx8mp-evk-iqaudio-dacplus.dtb \
26 freescale/imx8mp-evk-iqaudio-dacpro.dtb \
25 freescale/imx8mp-evk-it6263-lvds-dual-channel.dtb \ 27 freescale/imx8mp-evk-it6263-lvds-dual-channel.dtb \
26 freescale/imx8mp-evk-jdi-wuxga-lvds-panel.dtb \ 28 freescale/imx8mp-evk-jdi-wuxga-lvds-panel.dtb \
29 freescale/imx8mp-evk-ndm.dtb \
27 freescale/imx8mp-evk-ov2775.dtb \ 30 freescale/imx8mp-evk-ov2775.dtb \
28 freescale/imx8mp-evk-ov2775-ov5640.dtb \ 31 freescale/imx8mp-evk-ov2775-ov5640.dtb \
29 freescale/imx8mp-evk-pcie-ep.dtb \ 32 freescale/imx8mp-evk-pcie-ep.dtb \
30 freescale/imx8mp-evk-rm67191.dtb \ 33 freescale/imx8mp-evk-rm67191.dtb \
34 freescale/imx8mp-evk-rm67199.dtb \
31 freescale/imx8mp-evk-root.dtb \ 35 freescale/imx8mp-evk-root.dtb \
32 freescale/imx8mp-evk-rpmsg.dtb \ 36 freescale/imx8mp-evk-rpmsg.dtb \
33 freescale/imx8mp-evk-sof-wm8960.dtb \ 37 freescale/imx8mp-evk-sof-wm8960.dtb \
34 freescale/imx8mp-evk-spdif-lb.dtb \ 38 freescale/imx8mp-evk-spdif-lb.dtb \
39 freescale/imx8mp-evk-usdhc1-m2.dtb \
35" 40"
36 41
37UBOOT_CONFIG_BASENAME = "imx8mp_evk" 42UBOOT_CONFIG_BASENAME = "imx8mp_evk"
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index 9907ef4b2..cea44ed18 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -7,19 +7,19 @@
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
14MACHINE_FEATURES += "pci wifi bluetooth optee bcm43455 bcm4356" 14MACHINE_FEATURES += "pci wifi bluetooth optee bcm43455 bcm4356"
15MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" 15MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
16 16
17MACHINE_SOCARCH_FILTER_append_mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d" 17MACHINE_SOCARCH_FILTER:append:mx8mq = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d"
18 18
19KERNEL_DEVICETREE = " \ 19KERNEL_DEVICETREE = " \
20 freescale/imx8mq-evk.dtb \ 20 freescale/imx8mq-evk.dtb \
21" 21"
22KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 22KERNEL_DEVICETREE:append:use-nxp-bsp = " \
23 freescale/imx8mq-evk-ak4497.dtb \ 23 freescale/imx8mq-evk-ak4497.dtb \
24 freescale/imx8mq-evk-audio-tdm.dtb \ 24 freescale/imx8mq-evk-audio-tdm.dtb \
25 freescale/imx8mq-evk-dcss-adv7535.dtb \ 25 freescale/imx8mq-evk-dcss-adv7535.dtb \
@@ -40,8 +40,8 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
40 freescale/imx8mq-evk-usdhc2-m2.dtb \ 40 freescale/imx8mq-evk-usdhc2-m2.dtb \
41" 41"
42 42
43IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" 43IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
44IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" 44IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
45 45
46UBOOT_SUFFIX = "bin" 46UBOOT_SUFFIX = "bin"
47 47
@@ -77,11 +77,4 @@ IMX_BOOT_SEEK = "33"
77OPTEE_BIN_EXT = "8mq" 77OPTEE_BIN_EXT = "8mq"
78 78
79# Add additional firmware 79# Add additional firmware
80MACHINE_FIRMWARE_append = " linux-firmware-ath10k" 80MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
81
82# Use gstreamer 1.16 from meta-freescale
83PREFERRED_VERSION_gstreamer1.0 ?= "1.16.imx"
84PREFERRED_VERSION_gstreamer1.0-plugins-base ?= "1.16.imx"
85PREFERRED_VERSION_gstreamer1.0-plugins-good ?= "1.16.imx"
86PREFERRED_VERSION_gstreamer1.0-plugins-bad ?= "1.16.imx"
87PREFERRED_VERSION_gstreamer1.0-libav ?= "1.16.0"
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index 5ceb6b8bb..c2e450ce9 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -6,15 +6,15 @@
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
13MACHINE_FEATURES += "pci optee bcm43455 bcm4356" 13MACHINE_FEATURES += "pci optee bcm43455 bcm4356"
14MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" 14MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
15 15
16# Don't include kernels in standard images 16# Don't include kernels in standard images
17RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" 17RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
18 18
19LOADADDR = "" 19LOADADDR = ""
20 20
@@ -55,8 +55,8 @@ UBOOT_MAKE_TARGET = \
55SPL_BINARY = \ 55SPL_BINARY = \
56 "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'spl/u-boot-spl.bin', \ 56 "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'spl/u-boot-spl.bin', \
57 '', d)}" 57 '', d)}"
58IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" 58IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
59IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" 59IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
60 60
61UBOOT_SUFFIX = "bin" 61UBOOT_SUFFIX = "bin"
62 62
@@ -86,4 +86,4 @@ IMX_BOOT_SOC_TARGET = "iMX8QM"
86BOARD_TYPE = "mek" 86BOARD_TYPE = "mek"
87 87
88# Add additional firmware 88# Add additional firmware
89MACHINE_FIRMWARE_append = " linux-firmware-ath10k" 89MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf
index 5b29138fc..29412cc35 100644
--- a/conf/machine/imx8qxp-mek.conf
+++ b/conf/machine/imx8qxp-mek.conf
@@ -8,7 +8,7 @@ MACHINEOVERRIDES =. "mx8qxp:"
8require include/imx8x-mek.inc 8require include/imx8x-mek.inc
9 9
10KERNEL_DEVICETREE_BASENAME = "${MACHINE}" 10KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
11KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 11KERNEL_DEVICETREE:append:use-nxp-bsp = " \
12 freescale/${KERNEL_DEVICETREE_BASENAME}-a0.dtb \ 12 freescale/${KERNEL_DEVICETREE_BASENAME}-a0.dtb \
13 freescale/${KERNEL_DEVICETREE_BASENAME}-dom0.dtb \ 13 freescale/${KERNEL_DEVICETREE_BASENAME}-dom0.dtb \
14 freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif.dtb \ 14 freescale/${KERNEL_DEVICETREE_BASENAME}-dpu-lcdif.dtb \
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 72b958cde..42acb2f24 100644
--- a/conf/machine/include/e5500-64b.inc
+++ b/conf/machine/include/e5500-64b.inc
@@ -1,11 +1,11 @@
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:"
8 8
9require conf/multilib.conf 9require conf/multilib.conf
10MULTILIBS ?= "multilib:lib32" 10MULTILIBS ?= "multilib:lib32"
11DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce5500" 11DEFAULTTUNE:virtclass-multilib-lib32 ?= "ppce5500"
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 e0e04dbc0..3611d51af 100644
--- a/conf/machine/include/e6500-64b.inc
+++ b/conf/machine/include/e6500-64b.inc
@@ -1,11 +1,11 @@
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:"
8 8
9require conf/multilib.conf 9require conf/multilib.conf
10MULTILIBS ?= "multilib:lib32" 10MULTILIBS ?= "multilib:lib32"
11DEFAULTTUNE_virtclass-multilib-lib32 ?= "ppce6500" 11DEFAULTTUNE:virtclass-multilib-lib32 ?= "ppce6500"
diff --git a/conf/machine/include/e6500.inc b/conf/machine/include/e6500.inc
index 8d773b6e4..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:"
@@ -9,4 +9,4 @@ BUILD_64BIT_KERNEL = "1"
9 9
10require conf/multilib.conf 10require conf/multilib.conf
11MULTILIBS ?= "multilib:lib64" 11MULTILIBS ?= "multilib:lib64"
12DEFAULTTUNE_virtclass-multilib-lib64 ?= "ppc64e6500" 12DEFAULTTUNE:virtclass-multilib-lib64 ?= "ppc64e6500"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index f92a08af1..217415f52 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -13,8 +13,8 @@ require conf/machine/include/utilities.inc
13IMX_DEFAULT_BSP ?= "mainline" 13IMX_DEFAULT_BSP ?= "mainline"
14 14
15# Those are SoC families we'd like to force the use of mainline BSP. 15# Those are SoC families we'd like to force the use of mainline BSP.
16IMX_DEFAULT_BSP_mxs ?= "mainline" 16IMX_DEFAULT_BSP:mxs ?= "mainline"
17IMX_DEFAULT_BSP_mx5 ?= "mainline" 17IMX_DEFAULT_BSP:mx5 ?= "mainline"
18 18
19MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:" 19MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:"
20 20
@@ -32,16 +32,16 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
32# ,----[ imx6qdlsabresd.conf ] 32# ,----[ imx6qdlsabresd.conf ]
33# | ### u-boot-fslc settings ### 33# | ### u-boot-fslc settings ###
34# | 34# |
35# | SPL_BINARY_pn-u-boot-fslc = "SPL" 35# | SPL_BINARY:pn-u-boot-fslc = "SPL"
36# | UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabresd_defconfig" 36# | UBOOT_MACHINE:pn-u-boot-fslc ?= "mx6sabresd_defconfig"
37# | UBOOT_SUFFIX_pn-u-boot-fslc = "img" 37# | UBOOT_SUFFIX:pn-u-boot-fslc = "img"
38# | 38# |
39# | ### u-boot-imx settings ### 39# | ### u-boot-imx settings ###
40# | 40# |
41# | # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC 41# | # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
42# | # variants. Change the defconfig to the targeted SoC variant. 42# | # variants. Change the defconfig to the targeted SoC variant.
43# | UBOOT_MACHINE_pn-u-boot-imx ?= "mx6qsabresd_defconfig" 43# | UBOOT_MACHINE:pn-u-boot-imx ?= "mx6qsabresd_defconfig"
44# | UBOOT_SUFFIX_pn-u-boot-imx = "imx" 44# | UBOOT_SUFFIX:pn-u-boot-imx = "imx"
45# `---- 45# `----
46# 46#
47# As result, the 'UBOOT_SUFFIX' is dynamically set based on the preferred U-Boot 47# As result, the 'UBOOT_SUFFIX' is dynamically set based on the preferred U-Boot
@@ -61,7 +61,7 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
61# | UBOOT_MACHINE = "mx53loco_config" 61# | UBOOT_MACHINE = "mx53loco_config"
62# `---- 62# `----
63IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc" 63IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc"
64UBOOT_SUFFIX ?= "${UBOOT_SUFFIX_pn-${IMX_DEFAULT_BOOTLOADER}}" 64UBOOT_SUFFIX ?= "${UBOOT_SUFFIX:pn-${IMX_DEFAULT_BOOTLOADER}}"
65 65
66# We need to export the original variable to allow it to be used when generating 66# We need to export the original variable to allow it to be used when generating
67# wic based images. 67# wic based images.
@@ -75,33 +75,33 @@ PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}"
75 75
76PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" 76PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native"
77 77
78UBOOT_ENTRYPOINT_mxs = "0x40008000" 78UBOOT_ENTRYPOINT:mxs = "0x40008000"
79UBOOT_ENTRYPOINT_mx51 = "0x90008000" 79UBOOT_ENTRYPOINT:mx51 = "0x90008000"
80UBOOT_ENTRYPOINT_mx53 = "0x70008000" 80UBOOT_ENTRYPOINT:mx53 = "0x70008000"
81UBOOT_ENTRYPOINT_mx6 = "0x10008000" 81UBOOT_ENTRYPOINT:mx6 = "0x10008000"
82UBOOT_ENTRYPOINT_mx6sl = "0x80008000" 82UBOOT_ENTRYPOINT:mx6sl = "0x80008000"
83UBOOT_ENTRYPOINT_mx6sll = "0x80008000" 83UBOOT_ENTRYPOINT:mx6sll = "0x80008000"
84UBOOT_ENTRYPOINT_mx6sx = "0x80008000" 84UBOOT_ENTRYPOINT:mx6sx = "0x80008000"
85UBOOT_ENTRYPOINT_mx6ul = "0x80008000" 85UBOOT_ENTRYPOINT:mx6ul = "0x80008000"
86UBOOT_ENTRYPOINT_mx6ull = "0x80008000" 86UBOOT_ENTRYPOINT:mx6ull = "0x80008000"
87UBOOT_ENTRYPOINT_mx6ulz = "0x80008000" 87UBOOT_ENTRYPOINT:mx6ulz = "0x80008000"
88UBOOT_ENTRYPOINT_mx7 = "0x80008000" 88UBOOT_ENTRYPOINT:mx7 = "0x80008000"
89UBOOT_ENTRYPOINT_mx7ulp = "0x60008000" 89UBOOT_ENTRYPOINT:mx7ulp = "0x60008000"
90UBOOT_ENTRYPOINT_mx8m = "0x40480000" 90UBOOT_ENTRYPOINT:mx8m = "0x40480000"
91UBOOT_ENTRYPOINT_vf = "0x80008000" 91UBOOT_ENTRYPOINT:vf = "0x80008000"
92 92
93# Some derivates can utilize the boot container provided by U-Boot, 93# Some derivates can utilize the boot container provided by U-Boot,
94# below variable sets that those machines which have a imx-boot-container 94# below variable sets that those machines which have a imx-boot-container
95# in their MACHINEOVERRIDES can inherit a imx-boot-container class 95# in their MACHINEOVERRIDES can inherit a imx-boot-container class
96UBOOT_PROVIDES_BOOT_CONTAINER = "0" 96UBOOT_PROVIDES_BOOT_CONTAINER = "0"
97UBOOT_PROVIDES_BOOT_CONTAINER_imx-boot-container = "1" 97UBOOT_PROVIDES_BOOT_CONTAINER:imx-boot-container = "1"
98 98
99PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" 99PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
100XSERVER_DRIVER = "xf86-video-fbdev" 100XSERVER_DRIVER = "xf86-video-fbdev"
101XSERVER_DRIVER_imxgpu2d = "xf86-video-imx-vivante" 101XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante"
102XSERVER_DRIVER_vf = "xf86-video-modesetting" 102XSERVER_DRIVER:vf = "xf86-video-modesetting"
103XSERVER_DRIVER_append_mx8 = " xf86-video-modesetting" 103XSERVER_DRIVER:append:mx8 = " xf86-video-modesetting"
104XSERVER_DRIVER_use-mainline-bsp = " \ 104XSERVER_DRIVER:use-mainline-bsp = " \
105 xf86-video-fbdev \ 105 xf86-video-fbdev \
106 xf86-video-modesetting \ 106 xf86-video-modesetting \
107 xserver-xorg-extension-glx \ 107 xserver-xorg-extension-glx \
@@ -118,41 +118,41 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
118# ARM_INSTRUCTION_SET = "thumb" 118# ARM_INSTRUCTION_SET = "thumb"
119# 119#
120# handled by software 120# handled by software
121# DEFAULTTUNE_mx6 ?= "cortexa9t-neon" 121# DEFAULTTUNE:mx6 ?= "cortexa9t-neon"
122# handled by hardware 122# handled by hardware
123DEFAULTTUNE_mx6 ?= "cortexa9thf-neon" 123DEFAULTTUNE:mx6 ?= "cortexa9thf-neon"
124DEFAULTTUNE_mx6ul ?= "cortexa7thf-neon" 124DEFAULTTUNE:mx6ul ?= "cortexa7thf-neon"
125DEFAULTTUNE_mx6ull ?= "cortexa7thf-neon" 125DEFAULTTUNE:mx6ull ?= "cortexa7thf-neon"
126DEFAULTTUNE_mx6ulz ?= "cortexa7thf-neon" 126DEFAULTTUNE:mx6ulz ?= "cortexa7thf-neon"
127DEFAULTTUNE_mx7 ?= "cortexa7thf-neon" 127DEFAULTTUNE:mx7 ?= "cortexa7thf-neon"
128DEFAULTTUNE_vf ?= "cortexa5thf-neon" 128DEFAULTTUNE:vf ?= "cortexa5thf-neon"
129 129
130DEFAULTTUNE_mx8m ?= "cortexa53-crypto" 130DEFAULTTUNE:mx8m ?= "cortexa53-crypto"
131DEFAULTTUNE_mx8qm ?= "cortexa72-cortexa53-crypto" 131DEFAULTTUNE:mx8qm ?= "cortexa72-cortexa53-crypto"
132DEFAULTTUNE_mx8qxp ?= "cortexa35-crypto" 132DEFAULTTUNE:mx8qxp ?= "cortexa35-crypto"
133 133
134INHERIT += "machine-overrides-extender" 134INHERIT += "machine-overrides-extender"
135 135
136MACHINEOVERRIDES_EXTENDER_mx25 = "use-mainline-bsp" 136MACHINEOVERRIDES_EXTENDER:mx25 = "use-mainline-bsp"
137MACHINEOVERRIDES_EXTENDER_mx6q = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d" 137MACHINEOVERRIDES_EXTENDER:mx6q = "imxfbdev:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
138MACHINEOVERRIDES_EXTENDER_mx6dl = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc" 138MACHINEOVERRIDES_EXTENDER:mx6dl = "imxfbdev:imxpxp:imxipu:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxepdc"
139MACHINEOVERRIDES_EXTENDER_mx6sx = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" 139MACHINEOVERRIDES_EXTENDER:mx6sx = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
140MACHINEOVERRIDES_EXTENDER_mx6sl = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc" 140MACHINEOVERRIDES_EXTENDER:mx6sl = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxepdc"
141MACHINEOVERRIDES_EXTENDER_mx6sll = "imxfbdev:imxpxp:imxepdc" 141MACHINEOVERRIDES_EXTENDER:mx6sll = "imxfbdev:imxpxp:imxepdc"
142MACHINEOVERRIDES_EXTENDER_mx6ul = "imxfbdev:imxpxp" 142MACHINEOVERRIDES_EXTENDER:mx6ul = "imxfbdev:imxpxp"
143MACHINEOVERRIDES_EXTENDER_mx6ull = "imxfbdev:imxpxp:imxepdc" 143MACHINEOVERRIDES_EXTENDER:mx6ull = "imxfbdev:imxpxp:imxepdc"
144MACHINEOVERRIDES_EXTENDER_mx6ulz = "imxfbdev:imxpxp:imxepdc" 144MACHINEOVERRIDES_EXTENDER:mx6ulz = "imxfbdev:imxpxp:imxepdc"
145MACHINEOVERRIDES_EXTENDER_mx7d = "imxfbdev:imxpxp:imxepdc" 145MACHINEOVERRIDES_EXTENDER:mx7d = "imxfbdev:imxpxp:imxepdc"
146MACHINEOVERRIDES_EXTENDER_mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d" 146MACHINEOVERRIDES_EXTENDER:mx7ulp = "imxfbdev:imxpxp:imxgpu:imxgpu2d:imxgpu3d"
147MACHINEOVERRIDES_EXTENDER_mx8qm = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" 147MACHINEOVERRIDES_EXTENDER:mx8qm = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"
148MACHINEOVERRIDES_EXTENDER_mx8mm = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" 148MACHINEOVERRIDES_EXTENDER:mx8mm = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
149MACHINEOVERRIDES_EXTENDER_mx8mn = "imxdrm:imxgpu:imxgpu3d" 149MACHINEOVERRIDES_EXTENDER:mx8mn = "imxdrm:imxgpu:imxgpu3d"
150MACHINEOVERRIDES_EXTENDER_mx8mp = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d" 150MACHINEOVERRIDES_EXTENDER:mx8mp = "imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d"
151MACHINEOVERRIDES_EXTENDER_mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d" 151MACHINEOVERRIDES_EXTENDER:mx8mq = "imxdrm:imxvpu:imxgpu:imxgpu3d"
152MACHINEOVERRIDES_EXTENDER_mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d" 152MACHINEOVERRIDES_EXTENDER:mx8qxp = "imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d"
153MACHINEOVERRIDES_EXTENDER_mx8dxl = "imxfbdev" 153MACHINEOVERRIDES_EXTENDER:mx8dxl = "imxfbdev"
154 154
155MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \ 155MACHINEOVERRIDES_EXTENDER_FILTER_OUT:use-mainline-bsp = " \
156 imx \ 156 imx \
157 \ 157 \
158 mx6 \ 158 mx6 \
@@ -182,40 +182,40 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT_use-mainline-bsp = " \
182 182
183# Sub-architecture support 183# Sub-architecture support
184MACHINE_SOCARCH_SUFFIX ?= "" 184MACHINE_SOCARCH_SUFFIX ?= ""
185MACHINE_SOCARCH_SUFFIX_mx6q = "-mx6qdl" 185MACHINE_SOCARCH_SUFFIX:mx6q = "-mx6qdl"
186MACHINE_SOCARCH_SUFFIX_mx6dl = "-mx6qdl" 186MACHINE_SOCARCH_SUFFIX:mx6dl = "-mx6qdl"
187MACHINE_SOCARCH_SUFFIX_mx6sx = "-mx6sx" 187MACHINE_SOCARCH_SUFFIX:mx6sx = "-mx6sx"
188MACHINE_SOCARCH_SUFFIX_mx6sl = "-mx6sl" 188MACHINE_SOCARCH_SUFFIX:mx6sl = "-mx6sl"
189MACHINE_SOCARCH_SUFFIX_mx6sll= "-mx6sll" 189MACHINE_SOCARCH_SUFFIX:mx6sll= "-mx6sll"
190MACHINE_SOCARCH_SUFFIX_mx7d = "-mx7d" 190MACHINE_SOCARCH_SUFFIX:mx7d = "-mx7d"
191MACHINE_SOCARCH_SUFFIX_mx7ulp = "-mx7ulp" 191MACHINE_SOCARCH_SUFFIX:mx7ulp = "-mx7ulp"
192MACHINE_SOCARCH_SUFFIX_vf60 = "-vf60" 192MACHINE_SOCARCH_SUFFIX:vf60 = "-vf60"
193MACHINE_SOCARCH_SUFFIX_vf50 = "-vf50" 193MACHINE_SOCARCH_SUFFIX:vf50 = "-vf50"
194MACHINE_SOCARCH_SUFFIX_mx6ul = "-mx6ul" 194MACHINE_SOCARCH_SUFFIX:mx6ul = "-mx6ul"
195MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul" 195MACHINE_SOCARCH_SUFFIX:mx6ull = "-mx6ul"
196MACHINE_SOCARCH_SUFFIX_mx6ulz = "-mx6ul" 196MACHINE_SOCARCH_SUFFIX:mx6ulz = "-mx6ul"
197MACHINE_SOCARCH_SUFFIX_mx8qm = "-mx8" 197MACHINE_SOCARCH_SUFFIX:mx8qm = "-mx8"
198MACHINE_SOCARCH_SUFFIX_mx8mm = "-mx8mm" 198MACHINE_SOCARCH_SUFFIX:mx8mm = "-mx8mm"
199MACHINE_SOCARCH_SUFFIX_mx8mn = "-mx8mn" 199MACHINE_SOCARCH_SUFFIX:mx8mn = "-mx8mn"
200MACHINE_SOCARCH_SUFFIX_mx8mp = "-mx8mp" 200MACHINE_SOCARCH_SUFFIX:mx8mp = "-mx8mp"
201MACHINE_SOCARCH_SUFFIX_mx8mq = "-mx8m" 201MACHINE_SOCARCH_SUFFIX:mx8mq = "-mx8m"
202MACHINE_SOCARCH_SUFFIX_mx8qxp = "-mx8" 202MACHINE_SOCARCH_SUFFIX:mx8qxp = "-mx8"
203MACHINE_SOCARCH_SUFFIX_mx8dxl = "-mx8dxl" 203MACHINE_SOCARCH_SUFFIX:mx8dxl = "-mx8dxl"
204MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx" 204MACHINE_SOCARCH_SUFFIX:use-mainline-bsp = "-imx"
205 205
206MACHINE_ARCH_FILTER = "virtual/kernel" 206MACHINE_ARCH_FILTER = "virtual/kernel"
207MACHINE_SOCARCH_FILTER_append_imx = " \ 207MACHINE_SOCARCH_FILTER:append:imx = " \
208 alsa-lib \ 208 alsa-lib \
209 gstreamer1.0 \ 209 gstreamer1.0 \
210 weston \ 210 weston \
211" 211"
212MACHINE_SOCARCH_FILTER_append_imxvpu = " \ 212MACHINE_SOCARCH_FILTER:append:imxvpu = " \
213 imx-codec \ 213 imx-codec \
214 imx-vpuwrap \ 214 imx-vpuwrap \
215 libimxvpuapi \ 215 libimxvpuapi \
216 virtual/imxvpu \ 216 virtual/imxvpu \
217" 217"
218MACHINE_SOCARCH_FILTER_append_imxgpu = " \ 218MACHINE_SOCARCH_FILTER:append:imxgpu = " \
219 virtual/egl \ 219 virtual/egl \
220 virtual/mesa \ 220 virtual/mesa \
221 virtual/libopenvg \ 221 virtual/libopenvg \
@@ -225,15 +225,15 @@ MACHINE_SOCARCH_FILTER_append_imxgpu = " \
225 opencv \ 225 opencv \
226 pango \ 226 pango \
227" 227"
228MACHINE_SOCARCH_FILTER_append_imxgpu2d = " \ 228MACHINE_SOCARCH_FILTER:append:imxgpu2d = " \
229 virtual/libg2d \ 229 virtual/libg2d \
230" 230"
231MACHINE_SOCARCH_FILTER_append_imxgpu3d = " \ 231MACHINE_SOCARCH_FILTER:append:imxgpu3d = " \
232 virtual/libgl \ 232 virtual/libgl \
233 virtual/libgles1 \ 233 virtual/libgles1 \
234 virtual/libgles2 \ 234 virtual/libgles2 \
235" 235"
236MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \ 236MACHINE_SOCARCH_FILTER:append:use-mainline-bsp = " \
237 virtual/egl \ 237 virtual/egl \
238 virtual/libopenvg \ 238 virtual/libopenvg \
239 virtual/libg2d \ 239 virtual/libg2d \
@@ -245,23 +245,23 @@ MACHINE_SOCARCH_FILTER_append_use-mainline-bsp = " \
245 pango \ 245 pango \
246 qtbase \ 246 qtbase \
247" 247"
248MACHINE_SOCARCH_FILTER_append_mx6q = " \ 248MACHINE_SOCARCH_FILTER:append:mx6q = " \
249 opencl-icd-loader \ 249 opencl-icd-loader \
250 opencl-clhpp \ 250 opencl-clhpp \
251 opencl-headers \ 251 opencl-headers \
252" 252"
253MACHINE_SOCARCH_FILTER_append_mx8 = " \ 253MACHINE_SOCARCH_FILTER:append:mx8 = " \
254 opencl-icd-loader \ 254 opencl-icd-loader \
255 opencl-clhpp \ 255 opencl-clhpp \
256 opencl-headers \ 256 opencl-headers \
257" 257"
258MACHINE_SOCARCH_FILTER_append_mx8qm = " \ 258MACHINE_SOCARCH_FILTER:append:mx8qm = " \
259 virtual/libopenvx \ 259 virtual/libopenvx \
260" 260"
261 261
262INHERIT += "fsl-dynamic-packagearch" 262INHERIT += "fsl-dynamic-packagearch"
263 263
264SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS_append = " \ 264SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS:append = " \
265 imx-gpu-viv->kernel-module-imx-gpu-viv \ 265 imx-gpu-viv->kernel-module-imx-gpu-viv \
266 libimxvpuapi->virtual/imxvpu \ 266 libimxvpuapi->virtual/imxvpu \
267 imx-vpuwrap->virtual/imxvpu \ 267 imx-vpuwrap->virtual/imxvpu \
@@ -271,44 +271,44 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS_append = " \
271 271
272# Firmware 272# Firmware
273MACHINE_FIRMWARE ?= "" 273MACHINE_FIRMWARE ?= ""
274MACHINE_FIRMWARE_append_mx25 = " firmware-imx-sdma-imx25" 274MACHINE_FIRMWARE:append:mx25 = " firmware-imx-sdma-imx25"
275MACHINE_FIRMWARE_append_mx27 = " firmware-imx-vpu-imx27" 275MACHINE_FIRMWARE:append:mx27 = " firmware-imx-vpu-imx27"
276MACHINE_FIRMWARE_append_mx7d = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc" 276MACHINE_FIRMWARE:append:mx7d = " linux-firmware-imx-sdma-imx7d firmware-imx-epdc"
277MACHINE_FIRMWARE_append_mx6 = " linux-firmware-imx-sdma-imx6q" 277MACHINE_FIRMWARE:append:mx6 = " linux-firmware-imx-sdma-imx6q"
278MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" 278MACHINE_FIRMWARE:append:mx6q = " firmware-imx-vpu-imx6q"
279MACHINE_FIRMWARE_append_mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc" 279MACHINE_FIRMWARE:append:mx6dl = " firmware-imx-vpu-imx6d firmware-imx-epdc"
280MACHINE_FIRMWARE_append_mx6sl = " firmware-imx-epdc" 280MACHINE_FIRMWARE:append:mx6sl = " firmware-imx-epdc"
281MACHINE_FIRMWARE_append_mx6sll = " firmware-imx-epdc" 281MACHINE_FIRMWARE:append:mx6sll = " firmware-imx-epdc"
282MACHINE_FIRMWARE_append_mx6ull = " firmware-imx-epdc" 282MACHINE_FIRMWARE:append:mx6ull = " firmware-imx-epdc"
283MACHINE_FIRMWARE_append_mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53" 283MACHINE_FIRMWARE:append:mx53 = " firmware-imx-vpu-imx53 firmware-imx-sdma-imx53"
284MACHINE_FIRMWARE_append_mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51" 284MACHINE_FIRMWARE:append:mx51 = " firmware-imx-vpu-imx51 firmware-imx-sdma-imx51"
285MACHINE_FIRMWARE_append_mx8mm = " linux-firmware-imx-sdma-imx7d" 285MACHINE_FIRMWARE:append:mx8mm = " linux-firmware-imx-sdma-imx7d"
286MACHINE_FIRMWARE_append_mx8mn = " linux-firmware-imx-sdma-imx7d" 286MACHINE_FIRMWARE:append:mx8mn = " linux-firmware-imx-sdma-imx7d"
287MACHINE_FIRMWARE_append_mx8mp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx" 287MACHINE_FIRMWARE:append:mx8mp = " linux-firmware-imx-sdma-imx7d firmware-imx-easrc-imx8mn firmware-imx-xcvr-imx8mp firmware-sof-imx"
288MACHINE_FIRMWARE_append_mx8mq = " linux-firmware-imx-sdma-imx7d" 288MACHINE_FIRMWARE:append:mx8mq = " linux-firmware-imx-sdma-imx7d"
289MACHINE_FIRMWARE_append_mx8qm = " firmware-imx-vpu-imx8" 289MACHINE_FIRMWARE:append:mx8qm = " firmware-imx-vpu-imx8"
290MACHINE_FIRMWARE_append_mx8qxp = " firmware-imx-vpu-imx8" 290MACHINE_FIRMWARE:append:mx8qxp = " firmware-imx-vpu-imx8"
291MACHINE_FIRMWARE_append_use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d" 291MACHINE_FIRMWARE:append:use-mainline-bsp = " linux-firmware-imx-sdma-imx6q linux-firmware-imx-sdma-imx7d firmware-imx-vpu-imx6q firmware-imx-vpu-imx6d"
292 292
293MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}" 293MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
294 294
295# Extra audio support 295# Extra audio support
296IMX_ALSA_EXTRA = "" 296IMX_ALSA_EXTRA = ""
297IMX_ALSA_EXTRA_use-nxp-bsp = "imx-alsa-plugins" 297IMX_ALSA_EXTRA:use-nxp-bsp = "imx-alsa-plugins"
298MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" 298MACHINE_EXTRA_RRECOMMENDS:append:mx6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
299MACHINE_EXTRA_RRECOMMENDS_append_mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" 299MACHINE_EXTRA_RRECOMMENDS:append:mx7 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
300MACHINE_EXTRA_RRECOMMENDS_append_mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}" 300MACHINE_EXTRA_RRECOMMENDS:append:mx8 = " ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', '${IMX_ALSA_EXTRA}', '', d)}"
301 301
302# Extra Cypress Wi-Fi and BTW firmware (Murata) 302# Extra Cypress Wi-Fi and BTW firmware (Murata)
303MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}" 303MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4339', 'linux-firmware-bcm4339', '', d)}"
304MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}" 304MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43430', 'linux-firmware-bcm43430', '', d)}"
305MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}" 305MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm43455', 'linux-firmware-bcm43455', '', d)}"
306MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}" 306MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4356', 'linux-firmware-bcm4356-pcie', '', d)}"
307MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'linux-firmware-bcm4359-pcie', '', d)}" 307MACHINE_FIRMWARE:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bcm4359', 'linux-firmware-bcm4359-pcie', '', d)}"
308 308
309# Extra QCA Wi-Fi & BTE driver and firmware 309# Extra QCA Wi-Fi & BTE driver and firmware
310MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}" 310MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca6174', 'packagegroup-fsl-qca6174', '', d)}"
311MACHINE_EXTRA_RRECOMMENDS_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca9377', 'packagegroup-fsl-qca9377', '', d)}" 311MACHINE_EXTRA_RRECOMMENDS:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'qca9377', 'packagegroup-fsl-qca9377', '', d)}"
312 312
313# Extra udev rules 313# Extra udev rules
314MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx" 314MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx"
@@ -320,29 +320,31 @@ MACHINE_EXTRA_RRECOMMENDS += " \
320 320
321# GStreamer 1.0 plugins 321# GStreamer 1.0 plugins
322MACHINE_GSTREAMER_1_0_PLUGIN ?= "" 322MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
323MACHINE_GSTREAMER_1_0_PLUGIN_mx6dl ?= "gstreamer1.0-plugins-imx-meta" 323MACHINE_GSTREAMER_1_0_PLUGIN:mx6dl ?= "gstreamer1.0-plugins-imx-meta"
324MACHINE_GSTREAMER_1_0_PLUGIN_mx6q ?= "gstreamer1.0-plugins-imx-meta" 324MACHINE_GSTREAMER_1_0_PLUGIN:mx6q ?= "gstreamer1.0-plugins-imx-meta"
325MACHINE_GSTREAMER_1_0_PLUGIN_mx6sl ?= "gstreamer1.0-plugins-imx-meta" 325MACHINE_GSTREAMER_1_0_PLUGIN:mx6sl ?= "gstreamer1.0-plugins-imx-meta"
326MACHINE_GSTREAMER_1_0_PLUGIN_mx6sx ?= "gstreamer1.0-plugins-imx-meta" 326MACHINE_GSTREAMER_1_0_PLUGIN:mx6sx ?= "gstreamer1.0-plugins-imx-meta"
327MACHINE_GSTREAMER_1_0_PLUGIN_mx6ul ?= "gstreamer1.0-plugins-imx-meta" 327MACHINE_GSTREAMER_1_0_PLUGIN:mx6ul ?= "gstreamer1.0-plugins-imx-meta"
328MACHINE_GSTREAMER_1_0_PLUGIN_mx6ull ?= "gstreamer1.0-plugins-imx-meta" 328MACHINE_GSTREAMER_1_0_PLUGIN:mx6ull ?= "gstreamer1.0-plugins-imx-meta"
329MACHINE_GSTREAMER_1_0_PLUGIN_mx7d ?= "gstreamer1.0-plugins-imx-meta" 329MACHINE_GSTREAMER_1_0_PLUGIN:mx7d ?= "gstreamer1.0-plugins-imx-meta"
330MACHINE_GSTREAMER_1_0_PLUGIN_mx8mm ?= "imx-gst1.0-plugin" 330MACHINE_GSTREAMER_1_0_PLUGIN:mx8mm ?= "imx-gst1.0-plugin"
331MACHINE_GSTREAMER_1_0_PLUGIN_mx8mn ?= "imx-gst1.0-plugin" 331MACHINE_GSTREAMER_1_0_PLUGIN:mx8mn ?= "imx-gst1.0-plugin"
332MACHINE_GSTREAMER_1_0_PLUGIN_mx8mp ?= "imx-gst1.0-plugin" 332MACHINE_GSTREAMER_1_0_PLUGIN:mx8mp ?= "imx-gst1.0-plugin"
333MACHINE_GSTREAMER_1_0_PLUGIN_mx8mq ?= "imx-gst1.0-plugin" 333MACHINE_GSTREAMER_1_0_PLUGIN:mx8mq ?= "imx-gst1.0-plugin"
334MACHINE_GSTREAMER_1_0_PLUGIN_mx8qm ?= "imx-gst1.0-plugin" 334MACHINE_GSTREAMER_1_0_PLUGIN:mx8qm ?= "imx-gst1.0-plugin"
335MACHINE_GSTREAMER_1_0_PLUGIN_mx8qxp ?= "imx-gst1.0-plugin" 335MACHINE_GSTREAMER_1_0_PLUGIN:mx8qxp ?= "imx-gst1.0-plugin"
336 336
337PREFERRED_VERSION_gstreamer1.0_mx8 ?= "1.16.2.imx" 337PREFERRED_VERSION_gstreamer1.0:mx8 ?= "1.18.0.imx"
338PREFERRED_VERSION_gstreamer1.0-plugins-base_mx8 ?= "1.16.2.imx" 338PREFERRED_VERSION_gstreamer1.0-plugins-base:mx8 ?= "1.18.0.imx"
339PREFERRED_VERSION_gstreamer1.0-plugins-good_mx8 ?= "1.16.3.imx" 339PREFERRED_VERSION_gstreamer1.0-plugins-good:mx8 ?= "1.18.0.imx"
340PREFERRED_VERSION_gstreamer1.0-plugins-bad_mx8 ?= "1.16.3.imx" 340PREFERRED_VERSION_gstreamer1.0-plugins-bad:mx8 ?= "1.18.0.imx"
341PREFERRED_VERSION_gstreamer1.0-libav_mx8 ?= "1.16.0" 341PREFERRED_VERSION_gstreamer1.0-plugins-ugly:mx8 ?= "1.18.0"
342PREFERRED_VERSION_gstreamer1.0-libav:mx8 ?= "1.18.0"
343PREFERRED_VERSION_gstreamer1.0-rtsp-server:mx8 ?= "1.18.0"
342 344
343# Determines if the SoC has support for Vivante kernel driver 345# Determines if the SoC has support for Vivante kernel driver
344SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0" 346SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT = "0"
345SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT_imxgpu = "1" 347SOC_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT:imxgpu = "1"
346 348
347# Handle Vivante kernel driver setting: 349# Handle Vivante kernel driver setting:
348# 0 - machine does not have Vivante GPU driver support 350# 0 - machine does not have Vivante GPU driver support
@@ -355,59 +357,60 @@ PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
355PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" 357PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
356PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" 358PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
357 359
358PREFERRED_PROVIDER_virtual/egl_imxgpu ?= "imx-gpu-viv" 360PREFERRED_PROVIDER_virtual/egl:imxgpu ?= "imx-gpu-viv"
359PREFERRED_PROVIDER_virtual/libgl_imxgpu3d ?= "imx-gpu-viv" 361PREFERRED_PROVIDER_virtual/libgl:imxgpu3d ?= "imx-gpu-viv"
360PREFERRED_PROVIDER_virtual/libgles1_imxgpu3d ?= "imx-gpu-viv" 362PREFERRED_PROVIDER_virtual/libgles1:imxgpu3d ?= "imx-gpu-viv"
361PREFERRED_PROVIDER_virtual/libgles2_imxgpu3d ?= "imx-gpu-viv" 363PREFERRED_PROVIDER_virtual/libgles2:imxgpu3d ?= "imx-gpu-viv"
362PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d" 364PREFERRED_PROVIDER_virtual/libg2d ?= "imx-gpu-g2d"
363PREFERRED_PROVIDER_virtual/libg2d_imxdpu ?= "imx-dpu-g2d" 365PREFERRED_PROVIDER_virtual/libg2d:imxdpu ?= "imx-dpu-g2d"
364PREFERRED_PROVIDER_opencl-clhpp_imxgpu ?= "imx-gpu-viv" 366PREFERRED_PROVIDER_opencl-clhpp:imxgpu ?= "imx-gpu-viv"
365PREFERRED_PROVIDER_opencl-headers_imxgpu ?= "imx-gpu-viv" 367PREFERRED_PROVIDER_opencl-headers:imxgpu ?= "imx-gpu-viv"
366PREFERRED_PROVIDER_opencl-icd-loader_imxgpu ?= "imx-gpu-viv" 368PREFERRED_PROVIDER_opencl-icd-loader:imxgpu ?= "imx-gpu-viv"
367 369
368PREFERRED_VERSION_weston_imx ?= "9.0.0.imx" 370PREFERRED_VERSION_weston:imx ?= "9.0.0.imx"
369PREFERRED_VERSION_weston_use-mainline-bsp = "" 371PREFERRED_VERSION_weston:use-mainline-bsp = ""
370 372
371PREFERRED_VERSION_wayland-protocols_mx6 ?= "1.20.imx" 373PREFERRED_VERSION_wayland-protocols:mx6 ?= "1.20.imx"
372PREFERRED_VERSION_wayland-protocols_mx7 ?= "1.20.imx" 374PREFERRED_VERSION_wayland-protocols:mx7 ?= "1.20.imx"
373PREFERRED_VERSION_wayland-protocols_mx8 ?= "1.20.imx" 375PREFERRED_VERSION_wayland-protocols:mx8 ?= "1.20.imx"
374 376
375# Use i.MX libdrm Version 377# Use i.MX libdrm Version
376PREFERRED_VERSION_libdrm_mx6 ?= "2.4.102.imx" 378PREFERRED_VERSION_libdrm:mx6 ?= "2.4.102.imx"
377PREFERRED_VERSION_libdrm_mx7 ?= "2.4.102.imx" 379PREFERRED_VERSION_libdrm:mx7 ?= "2.4.102.imx"
378PREFERRED_VERSION_libdrm_mx8 ?= "2.4.102.imx" 380PREFERRED_VERSION_libdrm:mx8 ?= "2.4.102.imx"
379 381
380# Use i.MX optee Version 382# Use i.MX optee Version
381PREFERRED_VERSION_optee-os_mx8 ?= "3.10.0.imx" 383PREFERRED_VERSION_optee-os:mx8 ?= "3.10.0.imx"
382PREFERRED_VERSION_optee-client_mx8 ?= "3.10.0.imx" 384PREFERRED_VERSION_optee-client:mx8 ?= "3.10.0.imx"
383PREFERRED_VERSION_optee-test_mx8 ?= "3.10.0.imx" 385PREFERRED_VERSION_optee-test:mx8 ?= "3.10.0.imx"
384 386
385#Use i.MX opencv Version for mx8 387#Use i.MX opencv Version for mx8
386PREFERRED_VERSION_opencv_mx8 ?= "4.5.2.imx" 388PREFERRED_VERSION_opencv:mx8 ?= "4.5.2.imx"
387 389
388# Handle default kernel 390# Handle default kernel
389IMX_DEFAULT_KERNEL = "linux-fslc-imx" 391IMX_DEFAULT_KERNEL = "linux-fslc-imx"
390IMX_DEFAULT_KERNEL_mxs = "linux-fslc" 392IMX_DEFAULT_KERNEL:mxs = "linux-fslc"
391IMX_DEFAULT_KERNEL_mx5 = "linux-fslc" 393IMX_DEFAULT_KERNEL:mx5 = "linux-fslc"
392IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-imx" 394IMX_DEFAULT_KERNEL:mx6 = "linux-fslc-imx"
393IMX_DEFAULT_KERNEL_mx7 = "linux-fslc-imx" 395IMX_DEFAULT_KERNEL:mx7 = "linux-fslc-imx"
394IMX_DEFAULT_KERNEL_mx8 = "linux-fslc-imx" 396IMX_DEFAULT_KERNEL:mx8 = "linux-fslc-imx"
395IMX_DEFAULT_KERNEL_mx7ulp = "linux-fslc-imx" 397IMX_DEFAULT_KERNEL:mx7ulp = "linux-fslc-imx"
396IMX_DEFAULT_KERNEL_mx6sll = "linux-fslc-imx" 398IMX_DEFAULT_KERNEL:mx6sll = "linux-fslc-imx"
397IMX_DEFAULT_KERNEL_mx6ul = "linux-fslc-imx" 399IMX_DEFAULT_KERNEL:mx6ul = "linux-fslc-imx"
398IMX_DEFAULT_KERNEL_mx6ull = "linux-fslc-imx" 400IMX_DEFAULT_KERNEL:mx6ull = "linux-fslc-imx"
399IMX_DEFAULT_KERNEL_use-mainline-bsp = "linux-fslc" 401IMX_DEFAULT_KERNEL:use-mainline-bsp = "linux-fslc"
400 402
401PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" 403PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
402 404
403SOC_DEFAULT_IMAGE_FSTYPES = "wic.bmap wic.gz" 405SOC_DEFAULT_IMAGE_FSTYPES = "wic.bmap wic.gz"
404SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot-mxsboot-sdcard wic.bmap wic.gz" 406SOC_DEFAULT_IMAGE_FSTYPES:mxs = "uboot-mxsboot-sdcard wic.bmap wic.gz"
405 407
406# Do not update fstab file when using wic images 408# Do not update fstab file when using wic images
407WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update" 409WIC_CREATE_EXTRA_ARGS ?= "--no-fstab-update"
408 410
409OPTEE_BOOT_IMAGE = "uTee" 411OPTEE_BIN_EXT ??= ""
410OPTEE_BOOT_IMAGE_aarch64 = "" 412OPTEE_BOOT_IMAGE = "tee.bin uTee-${OPTEE_BIN_EXT}"
413OPTEE_BOOT_IMAGE:aarch64 = "tee.bin"
411 414
412IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" 415IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
413 416
@@ -419,7 +422,7 @@ IMAGE_BOOT_FILES ?= " \
419 422
420### wic default support 423### wic default support
421OPTEE_WKS_FILE_DEPENDS = "optee-os" 424OPTEE_WKS_FILE_DEPENDS = "optee-os"
422OPTEE_WKS_FILE_DEPENDS_aarch64 = "" 425OPTEE_WKS_FILE_DEPENDS:aarch64 = ""
423 426
424WKS_FILE_DEPENDS ?= " \ 427WKS_FILE_DEPENDS ?= " \
425 virtual/bootloader \ 428 virtual/bootloader \
@@ -429,8 +432,8 @@ WKS_FILE_DEPENDS ?= " \
429 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ 432 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \
430" 433"
431 434
432WKS_FILE_DEPENDS_append_mx8 = " imx-boot" 435WKS_FILE_DEPENDS:append:mx8 = " imx-boot"
433WKS_FILE_DEPENDS_append_mx8m = " imx-boot" 436WKS_FILE_DEPENDS:append:mx8m = " imx-boot"
434 437
435# We need to restrict the append so we don't add this for other i.MX SoC's. 438# We need to restrict the append so we don't add this for other i.MX SoC's.
436# Derivatives that are not yet adopted the usage of boot container provided 439# Derivatives that are not yet adopted the usage of boot container provided
@@ -444,15 +447,15 @@ WKS_FILE_DEPENDS_append_mx8m = " imx-boot"
444# deployment task extesion execution defined in imx-boot-container class. 447# deployment task extesion execution defined in imx-boot-container class.
445# For NXP BSP: rename is done in 'imx-boot' recipe at the execution of compile 448# For NXP BSP: rename is done in 'imx-boot' recipe at the execution of compile
446# task. 449# task.
447WKS_FILE_DEPENDS_append_use-mainline-bsp_aarch64 = " \ 450WKS_FILE_DEPENDS:append:use-mainline-bsp:aarch64 = " \
448 ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ 451 ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \
449" 452"
450 453
451SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in" 454SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks.in"
452SOC_DEFAULT_WKS_FILE_mx8m ?= "imx-imx-boot-bootpart.wks.in" 455SOC_DEFAULT_WKS_FILE:mx8m ?= "imx-imx-boot-bootpart.wks.in"
453 456
454SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in" 457SOC_DEFAULT_WKS_FILE:mx8 ?= "imx-imx-boot-bootpart.wks.in"
455SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" 458SOC_DEFAULT_WKS_FILE:mxs ?= "imx-uboot-mxs-bootpart.wks.in"
456 459
457# Boot container built as a part of mainline U-Boot uses different WKS 460# Boot container built as a part of mainline U-Boot uses different WKS
458# file as the entire mx8m series, as U-Boot versions later than 2021.04 are 461# file as the entire mx8m series, as U-Boot versions later than 2021.04 are
@@ -462,19 +465,19 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in"
462# replacement of imx-boot from NXP. 465# replacement of imx-boot from NXP.
463# Creation of those binary files is controlled by UBOOT_PROVIDES_BOOT_CONTAINER 466# Creation of those binary files is controlled by UBOOT_PROVIDES_BOOT_CONTAINER
464# variable defined above. 467# variable defined above.
465SOC_DEFAULT_WKS_FILE_imx-boot-container ?= "imx-boot-container-bootpart.wks.in" 468SOC_DEFAULT_WKS_FILE:imx-boot-container ?= "imx-boot-container-bootpart.wks.in"
466 469
467WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" 470WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
468 471
469SERIAL_CONSOLES = "115200;ttymxc0" 472SERIAL_CONSOLES = "115200;ttymxc0"
470SERIAL_CONSOLES_mxs = "115200;ttyAMA0" 473SERIAL_CONSOLES:mxs = "115200;ttyAMA0"
471 474
472KERNEL_IMAGETYPE = "zImage" 475KERNEL_IMAGETYPE = "zImage"
473KERNEL_IMAGETYPE_aarch64 = "Image" 476KERNEL_IMAGETYPE:aarch64 = "Image"
474 477
475MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" 478MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
476 479
477# Add the ability to specify _imx machines 480# Add the ability to specify imx machines
478MACHINEOVERRIDES =. "imx:" 481MACHINEOVERRIDES =. "imx:"
479 482
480HOSTTOOLS_NONFATAL_append_mx8 = " sha384sum" 483HOSTTOOLS_NONFATAL:append:mx8 = " sha384sum"
diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc
index 2868b4d6c..a0006399c 100644
--- a/conf/machine/include/imx8dxl-evk.inc
+++ b/conf/machine/include/imx8dxl-evk.inc
@@ -1,15 +1,15 @@
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
8MACHINE_FEATURES += "pci bcm43455 bcm4356" 8MACHINE_FEATURES += "pci bcm43455 bcm4356"
9MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" 9MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
10 10
11# Don't include kernels in standard images 11# Don't include kernels in standard images
12RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" 12RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
13 13
14LOADADDR = "" 14LOADADDR = ""
15 15
@@ -23,7 +23,7 @@ USE_VT = "0"
23KERNEL_DEVICETREE = " \ 23KERNEL_DEVICETREE = " \
24 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ 24 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
25" 25"
26KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 26KERNEL_DEVICETREE:append:use-nxp-bsp = " \
27 freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \ 27 freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
28" 28"
29 29
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index f458c56de..85419a454 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -1,29 +1,34 @@
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
6# Mainline BSP defaults to "generic" cortexa53 configuration,
7# adjust it here to include crypto extension which enables
8# inline NEON and FPU code generation
9DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
5 10
6MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356" 11MACHINE_FEATURES += "pci wifi bluetooth bcm43455 bcm4356"
7 12
8# NXP BSP can consume proprietary jailhouse, BCM4359, and QCA9377 driver and firmware 13# NXP BSP can consume proprietary jailhouse and BCM4359 firmware
9# Since the firmware is not available publicly, and rather distributed 14# Since the firmware is not available publicly, and rather distributed
10# under "Proprietary" license - we opt-out from using it in all BSPs 15# under "Proprietary" license - we opt-out from using it in all BSPs
11# and pin it to NXP BSP only 16# and pin it to NXP BSP only
12# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have 17# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
13# a full support for it yet. 18# a full support for it yet.
14MACHINE_FEATURES_append_use-nxp-bsp = " optee jailhouse bcm4359 qca9377" 19MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359"
15 20
16KERNEL_DEVICETREE = " \ 21KERNEL_DEVICETREE = " \
17 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ 22 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
18" 23"
19KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 24KERNEL_DEVICETREE:append:use-nxp-bsp = " \
20 freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \ 25 freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
21 freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ 26 freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \
22" 27"
23UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" 28UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
24 29
25IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" 30IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
26IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" 31IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
27 32
28UBOOT_SUFFIX = "bin" 33UBOOT_SUFFIX = "bin"
29 34
@@ -51,18 +56,18 @@ SERIAL_CONSOLES = "115200;ttymxc1"
51# to be used to define the boot process. 56# to be used to define the boot process.
52# We opt-in for Syslinux, since it is designated as a preferred 57# We opt-in for Syslinux, since it is designated as a preferred
53# distro boot mode according to the U-Boot documentation. 58# distro boot mode according to the U-Boot documentation.
54UBOOT_EXTLINUX_use-mainline-bsp = "1" 59UBOOT_EXTLINUX:use-mainline-bsp = "1"
55UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default" 60UBOOT_EXTLINUX_LABELS:use-mainline-bsp = "default"
56UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Mini EVK" 61UBOOT_EXTLINUX_DEFAULT_LABEL:use-mainline-bsp = "i.MX8M Mini EVK"
57 62
58UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Mini EVK" 63UBOOT_EXTLINUX_MENU_DESCRIPTION:default:use-mainline-bsp = "i.MX8M Mini EVK"
59UBOOT_EXTLINUX_FDT_default_use-mainline-bsp = "../${KERNEL_DEVICETREE_BASENAME}.dtb" 64UBOOT_EXTLINUX_FDT:default:use-mainline-bsp = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
60UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}" 65UBOOT_EXTLINUX_CONSOLE:default:use-mainline-bsp = "console=${console}"
61UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp = "root=/dev/mmcblk1p2" 66UBOOT_EXTLINUX_ROOT:default:use-mainline-bsp = "root=/dev/mmcblk1p2"
62 67
63# Add extlinux.conf to the lis of files, which are deployed onto the 68# Add extlinux.conf to the lis of files, which are deployed onto the
64# boot partition 69# boot partition
65IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" 70IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
66 71
67LOADADDR = "" 72LOADADDR = ""
68UBOOT_SUFFIX = "bin" 73UBOOT_SUFFIX = "bin"
@@ -73,4 +78,4 @@ OPTEE_BIN_EXT = "8mm"
73TEE_LOAD_ADDR = "0xbe000000" 78TEE_LOAD_ADDR = "0xbe000000"
74 79
75# Add additional firmware 80# Add additional firmware
76MACHINE_FIRMWARE_append = " linux-firmware-ath10k" 81MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index a0e39857c..4f8973491 100644
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -1,19 +1,24 @@
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
6# Mainline BSP defaults to "generic" cortexa53 configuration,
7# adjust it here to include crypto extension which enables
8# inline NEON and FPU code generation
9DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
5 10
6MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356" 11MACHINE_FEATURES += "wifi bluetooth bcm43455 bcm4356"
7 12
8# NXP BSP can consume proprietary jailhouse and Broadcom drivers 13# NXP BSP can consume proprietary jailhouse and Broadcom drivers
9# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have 14# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
10# a full support for it yet. 15# a full support for it yet.
11MACHINE_FEATURES_append_use-nxp-bsp = " optee jailhouse bcm4359" 16MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse bcm4359"
12 17
13KERNEL_DEVICETREE = " \ 18KERNEL_DEVICETREE = " \
14 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ 19 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
15" 20"
16KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 21KERNEL_DEVICETREE:append:use-nxp-bsp = " \
17 freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \ 22 freescale/${KERNEL_DEVICETREE_BASENAME}-ak5558.dtb \
18 freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \ 23 freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
19 freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \ 24 freescale/${KERNEL_DEVICETREE_BASENAME}-rm67191.dtb \
@@ -22,8 +27,8 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
22" 27"
23UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" 28UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
24 29
25IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" 30IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
26IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" 31IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
27 32
28UBOOT_SUFFIX = "bin" 33UBOOT_SUFFIX = "bin"
29 34
@@ -52,18 +57,18 @@ SERIAL_CONSOLES = "115200;ttymxc1"
52# to be used to define the boot process. 57# to be used to define the boot process.
53# We opt-in for Syslinux, since it is designated as a preferred 58# We opt-in for Syslinux, since it is designated as a preferred
54# distro boot mode according to the U-Boot documentation. 59# distro boot mode according to the U-Boot documentation.
55UBOOT_EXTLINUX_use-mainline-bsp = "1" 60UBOOT_EXTLINUX:use-mainline-bsp = "1"
56UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default" 61UBOOT_EXTLINUX_LABELS:use-mainline-bsp = "default"
57UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Nano EVK" 62UBOOT_EXTLINUX_DEFAULT_LABEL:use-mainline-bsp = "i.MX8M Nano EVK"
58 63
59UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Nano EVK" 64UBOOT_EXTLINUX_MENU_DESCRIPTION:default:use-mainline-bsp = "i.MX8M Nano EVK"
60UBOOT_EXTLINUX_FDT_default_use-mainline-bsp = "../${KERNEL_DEVICETREE_BASENAME}.dtb" 65UBOOT_EXTLINUX_FDT:default:use-mainline-bsp = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
61UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}" 66UBOOT_EXTLINUX_CONSOLE:default:use-mainline-bsp = "console=${console}"
62UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp = "root=/dev/mmcblk1p2" 67UBOOT_EXTLINUX_ROOT:default:use-mainline-bsp = "root=/dev/mmcblk1p2"
63 68
64# Add extlinux.conf to the lis of files, which are deployed onto the 69# Add extlinux.conf to the lis of files, which are deployed onto the
65# boot partition 70# boot partition
66IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" 71IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
67 72
68BOOT_SPACE = "65536" 73BOOT_SPACE = "65536"
69LOADADDR = "" 74LOADADDR = ""
@@ -79,4 +84,4 @@ OPTEE_BIN_EXT = "8mn"
79TEE_LOAD_ADDR = "0x56000000" 84TEE_LOAD_ADDR = "0x56000000"
80 85
81# Add additional firmware 86# Add additional firmware
82MACHINE_FIRMWARE_append = " linux-firmware-ath10k" 87MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index d070831ff..7635d08ce 100644
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -1,14 +1,19 @@
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
6# Mainline BSP defaults to "generic" cortexa53 configuration,
7# adjust it here to include crypto extension which enables
8# inline NEON and FPU code generation
9DEFAULTTUNE:use-mainline-bsp = "cortexa53-crypto"
5 10
6MACHINE_FEATURES += "pci wifi bluetooth" 11MACHINE_FEATURES += "pci wifi bluetooth"
7 12
8# NXP BSP can consume proprietary jailhouse and Marvell drivers 13# NXP BSP can consume proprietary jailhouse and Marvell drivers
9# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have 14# OP-TEE is also applicable to NXP BSP, mainline BSP seems not to have
10# a full support for it yet. 15# a full support for it yet.
11MACHINE_FEATURES_append_use-nxp-bsp = " optee jailhouse mrvl8997" 16MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse mrvl8997"
12 17
13# Mainline kernel contains only one DTB file for 18# Mainline kernel contains only one DTB file for
14# imx8mpevk machine 19# imx8mpevk machine
@@ -18,8 +23,8 @@ KERNEL_DEVICETREE = " \
18 23
19UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" 24UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
20 25
21IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx" 26IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
22IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc" 27IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
23 28
24UBOOT_SUFFIX = "bin" 29UBOOT_SUFFIX = "bin"
25 30
@@ -50,18 +55,18 @@ SERIAL_CONSOLES = "115200;ttymxc1"
50# to be used to define the boot process. 55# to be used to define the boot process.
51# We opt-in for Syslinux, since it is designated as a preferred 56# We opt-in for Syslinux, since it is designated as a preferred
52# distro boot mode according to the U-Boot documentation. 57# distro boot mode according to the U-Boot documentation.
53UBOOT_EXTLINUX_use-mainline-bsp = "1" 58UBOOT_EXTLINUX:use-mainline-bsp = "1"
54UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default" 59UBOOT_EXTLINUX_LABELS:use-mainline-bsp = "default"
55UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Plus EVK" 60UBOOT_EXTLINUX_DEFAULT_LABEL:use-mainline-bsp = "i.MX8M Plus EVK"
56 61
57UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Plus EVK" 62UBOOT_EXTLINUX_MENU_DESCRIPTION:default:use-mainline-bsp = "i.MX8M Plus EVK"
58UBOOT_EXTLINUX_FDT_default_use-mainline-bsp = "../${KERNEL_DEVICETREE_BASENAME}.dtb" 63UBOOT_EXTLINUX_FDT:default:use-mainline-bsp = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
59UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}" 64UBOOT_EXTLINUX_CONSOLE:default:use-mainline-bsp = "console=${console}"
60UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp = "root=/dev/mmcblk1p2" 65UBOOT_EXTLINUX_ROOT:default:use-mainline-bsp = "root=/dev/mmcblk1p2"
61 66
62# Add extlinux.conf to the lis of files, which are deployed onto the 67# Add extlinux.conf to the lis of files, which are deployed onto the
63# boot partition 68# boot partition
64IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf" 69IMAGE_BOOT_FILES:append:use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
65 70
66LOADADDR = "" 71LOADADDR = ""
67UBOOT_SUFFIX = "bin" 72UBOOT_SUFFIX = "bin"
@@ -72,4 +77,4 @@ OPTEE_BIN_EXT = "8mp"
72TEE_LOAD_ADDR = "0x56000000" 77TEE_LOAD_ADDR = "0x56000000"
73 78
74# Add additional firmware 79# Add additional firmware
75MACHINE_FIRMWARE_append = " linux-firmware-ath10k" 80MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc
index 55a28c877..e6f4f058b 100644
--- a/conf/machine/include/imx8x-mek.inc
+++ b/conf/machine/include/imx8x-mek.inc
@@ -1,15 +1,15 @@
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
8MACHINE_FEATURES += "pci optee bcm43455 bcm4356" 8MACHINE_FEATURES += "pci optee bcm43455 bcm4356"
9MACHINE_FEATURES_append_use-nxp-bsp = " bcm4359" 9MACHINE_FEATURES:append:use-nxp-bsp = " bcm4359"
10 10
11# Don't include kernels in standard images 11# Don't include kernels in standard images
12RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" 12RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
13 13
14LOADADDR = "" 14LOADADDR = ""
15 15
@@ -23,7 +23,7 @@ USE_VT = "0"
23KERNEL_DEVICETREE = " \ 23KERNEL_DEVICETREE = " \
24 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \ 24 freescale/${KERNEL_DEVICETREE_BASENAME}.dtb \
25" 25"
26KERNEL_DEVICETREE_append_use-nxp-bsp = " \ 26KERNEL_DEVICETREE:append:use-nxp-bsp = " \
27 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191.dtb \ 27 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191.dtb \
28 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191-rpmsg.dtb \ 28 freescale/${KERNEL_DEVICETREE_BASENAME}-dsi-rm67191-rpmsg.dtb \
29 freescale/${KERNEL_DEVICETREE_BASENAME}-dsp.dtb \ 29 freescale/${KERNEL_DEVICETREE_BASENAME}-dsp.dtb \
@@ -71,4 +71,4 @@ IMXBOOT_TARGETS = \
71BOARD_TYPE = "mek" 71BOARD_TYPE = "mek"
72 72
73# Add additional firmware 73# Add additional firmware
74MACHINE_FIRMWARE_append = " linux-firmware-ath10k" 74MACHINE_FIRMWARE:append = " linux-firmware-ath10k"
diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index 0a42160f0..0d8978e34 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -9,8 +9,8 @@ PREFERRED_PROVIDER_nativesdk-u-boot-mkimage ??= "nativesdk-u-boot-tools"
9PREFERRED_VERSION_testfloat = "2a" 9PREFERRED_VERSION_testfloat = "2a"
10 10
11SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz" 11SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz"
12SOC_DEFAULT_IMAGE_FSTYPES_append_ls1043a = " wic.bz2" 12SOC_DEFAULT_IMAGE_FSTYPES:append:ls1043a = " wic.bz2"
13SOC_DEFAULT_IMAGE_FSTYPES_append_ls1046a = " wic.bz2" 13SOC_DEFAULT_IMAGE_FSTYPES:append:ls1046a = " wic.bz2"
14IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" 14IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
15 15
16# Composite Image Layout (in KBytes) 16# Composite Image Layout (in KBytes)
@@ -31,8 +31,8 @@ IMAGE_BOOT_FILES ?= " \
31" 31"
32 32
33SOC_DEFAULT_WKS_FILE ?= "" 33SOC_DEFAULT_WKS_FILE ?= ""
34SOC_DEFAULT_WKS_FILE_ls1043a ?= "ls104x-uboot-bootpart.wks.in" 34SOC_DEFAULT_WKS_FILE:ls1043a ?= "ls104x-uboot-bootpart.wks.in"
35SOC_DEFAULT_WKS_FILE_ls1046a ?= "ls104x-uboot-bootpart.wks.in" 35SOC_DEFAULT_WKS_FILE:ls1046a ?= "ls104x-uboot-bootpart.wks.in"
36 36
37WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" 37WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
38 38
@@ -54,7 +54,7 @@ MACHINEOVERRIDES =. "use-${QORIQ_DEFAULT_BSP}-bsp:"
54 54
55# Sub-architecture support 55# Sub-architecture support
56MACHINE_SOCARCH_SUFFIX ?= "" 56MACHINE_SOCARCH_SUFFIX ?= ""
57MACHINE_SOCARCH_SUFFIX_qoriq = "-qoriq" 57MACHINE_SOCARCH_SUFFIX:qoriq = "-qoriq"
58 58
59MACHINE_ARCH_FILTER = "virtual/kernel" 59MACHINE_ARCH_FILTER = "virtual/kernel"
60 60
diff --git a/conf/machine/include/utilities.inc b/conf/machine/include/utilities.inc
index f11b588bb..34ce7abcb 100644
--- a/conf/machine/include/utilities.inc
+++ b/conf/machine/include/utilities.inc
@@ -23,6 +23,6 @@ def make_dtb_boot_files(d):
23 23
24def get_spl_binary(d): 24def get_spl_binary(d):
25 imx_default_bootloader = d.get('IMX_DEFAULT_BOOTLOADER') 25 imx_default_bootloader = d.get('IMX_DEFAULT_BOOTLOADER')
26 spl_binary = d.getVar("SPL_BINARY_pn-%s" % imx_default_bootloader) 26 spl_binary = d.getVar("SPL_BINARY:pn-%s" % imx_default_bootloader)
27 27
28 return spl_binary or "" 28 return spl_binary or ""
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
diff --git a/conf/machine/ls1028ardb.conf b/conf/machine/ls1028ardb.conf
index 63f3802f7..d70a5a619 100644
--- a/conf/machine/ls1028ardb.conf
+++ b/conf/machine/ls1028ardb.conf
@@ -22,7 +22,7 @@ UBOOT_CONFIG[tfa-secure-boot] = "ls1028ardb_tfa_SECURE_BOOT_defconfig"
22UBOOT_CONFIG[tfa] = "ls1028ardb_tfa_defconfig" 22UBOOT_CONFIG[tfa] = "ls1028ardb_tfa_defconfig"
23 23
24KERNEL_DEVICETREE ?= "freescale/fsl-ls1028a-rdb.dtb freescale/fsl-ls1028a-qds.dtb" 24KERNEL_DEVICETREE ?= "freescale/fsl-ls1028a-rdb.dtb freescale/fsl-ls1028a-qds.dtb"
25KERNEL_DEVICETREE_append_use-nxp-bsp = "\ 25KERNEL_DEVICETREE:append:use-nxp-bsp = "\
26 freescale/fsl-ls1028a-rdb-dpdk.dtb \ 26 freescale/fsl-ls1028a-rdb-dpdk.dtb \
27" 27"
28KERNEL_DEFCONFIG ?= "defconfig" 28KERNEL_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf
index fa8ab6156..4ff3c0acb 100644
--- a/conf/machine/ls1043ardb.conf
+++ b/conf/machine/ls1043ardb.conf
@@ -27,7 +27,7 @@ KERNEL_DEVICETREE ?= "\
27 freescale/fsl-ls1043a-qds.dtb \ 27 freescale/fsl-ls1043a-qds.dtb \
28" 28"
29# usdpaa dtb is used for dpdk. TODO: rename in kernel 29# usdpaa dtb is used for dpdk. TODO: rename in kernel
30KERNEL_DEVICETREE_prepend_use-nxp-bsp = "\ 30KERNEL_DEVICETREE:prepend:use-nxp-bsp = "\
31 freescale/fsl-ls1043a-rdb-sdk.dtb \ 31 freescale/fsl-ls1043a-rdb-sdk.dtb \
32 freescale/fsl-ls1043a-rdb-usdpaa.dtb \ 32 freescale/fsl-ls1043a-rdb-usdpaa.dtb \
33 freescale/fsl-ls1043a-qds-sdk.dtb \ 33 freescale/fsl-ls1043a-qds-sdk.dtb \
diff --git a/conf/machine/ls1046afrwy.conf b/conf/machine/ls1046afrwy.conf
index e6eabc0f3..eb3c0bb6f 100644
--- a/conf/machine/ls1046afrwy.conf
+++ b/conf/machine/ls1046afrwy.conf
@@ -25,7 +25,7 @@ KERNEL_DEVICETREE ?= "\
25 freescale/fsl-ls1046a-frwy.dtb \ 25 freescale/fsl-ls1046a-frwy.dtb \
26" 26"
27# usdpaa dtb is used for dpdk. TODO: rename in kernel 27# usdpaa dtb is used for dpdk. TODO: rename in kernel
28KERNEL_DEVICETREE_prepend_use-nxp-bsp = "\ 28KERNEL_DEVICETREE:prepend:use-nxp-bsp = "\
29 freescale/fsl-ls1046a-frwy-sdk.dtb \ 29 freescale/fsl-ls1046a-frwy-sdk.dtb \
30 freescale/fsl-ls1046a-frwy-usdpaa.dtb \ 30 freescale/fsl-ls1046a-frwy-usdpaa.dtb \
31" 31"
diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf
index 97fb1e29e..8e815295a 100644
--- a/conf/machine/ls1046ardb.conf
+++ b/conf/machine/ls1046ardb.conf
@@ -26,7 +26,7 @@ KERNEL_DEVICETREE ?= "\
26 freescale/fsl-ls1046a-qds.dtb \ 26 freescale/fsl-ls1046a-qds.dtb \
27" 27"
28# usdpaa dtb is used for dpdk. TODO: rename in kernel 28# usdpaa dtb is used for dpdk. TODO: rename in kernel
29KERNEL_DEVICETREE_prepend_use-nxp-bsp = "\ 29KERNEL_DEVICETREE:prepend:use-nxp-bsp = "\
30 freescale/fsl-ls1046a-rdb-sdk.dtb \ 30 freescale/fsl-ls1046a-rdb-sdk.dtb \
31 freescale/fsl-ls1046a-rdb-usdpaa.dtb \ 31 freescale/fsl-ls1046a-rdb-usdpaa.dtb \
32 freescale/fsl-ls1046a-qds-sdk.dtb \ 32 freescale/fsl-ls1046a-qds-sdk.dtb \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-16 01:51:32 +0000