summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2021-03-19 18:51:30 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2021-03-24 11:18:34 -0300
commit776932e187f38ca53ed57fc662461ba0da005520 (patch)
tree490e1782ed6e800bdc0146ed8990934abed5af97
parentd9d5068e7ae6b6e2b55236ff515b50172d44f803 (diff)
downloadmeta-freescale-776932e187f38ca53ed57fc662461ba0da005520.tar.gz
Rework the u-boot-fslc and u-boot-imx settings logic
We need to make it more obvious what is in use, when we support both bootloaders and for it we are now using the _pn suffix for both. This also fixes the WIC_FILE depending on the choice otherwise image build fails. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--conf/machine/imx23evk.conf7
-rw-r--r--conf/machine/imx25pdk.conf7
-rw-r--r--conf/machine/imx28evk.conf7
-rw-r--r--conf/machine/imx51evk.conf7
-rw-r--r--conf/machine/imx53ard.conf9
-rw-r--r--conf/machine/imx53qsb.conf7
-rw-r--r--conf/machine/imx6qdlsabreauto.conf20
-rw-r--r--conf/machine/imx6qdlsabresd.conf22
-rw-r--r--conf/machine/imx6slevk.conf3
-rw-r--r--conf/machine/imx6sllevk.conf3
-rw-r--r--conf/machine/imx6sxsabreauto.conf4
-rw-r--r--conf/machine/imx6sxsabresd.conf3
-rw-r--r--conf/machine/imx6ulevk.conf22
-rw-r--r--conf/machine/imx6ullevk.conf3
-rw-r--r--conf/machine/imx6ulz-14x14-evk.conf3
-rw-r--r--conf/machine/imx7dsabresd.conf2
-rw-r--r--conf/machine/imx7ulpevk.conf3
-rw-r--r--conf/machine/imx8dxl-evk.conf5
-rw-r--r--conf/machine/imx8mp-evk.conf5
-rw-r--r--conf/machine/imx8mq-evk.conf5
-rw-r--r--conf/machine/imx8qm-mek.conf3
-rw-r--r--conf/machine/include/imx-base.inc53
-rw-r--r--conf/machine/include/imx8mm-evk.inc5
-rw-r--r--conf/machine/include/imx8mn-evk.inc5
-rw-r--r--conf/machine/include/imx8x-mek.inc5
25 files changed, 187 insertions, 31 deletions
diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index 009aff79..8abc5a95 100644
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -9,6 +9,13 @@ MACHINEOVERRIDES =. "mxs:mx23:"
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/tune-arm926ejs.inc
11 11
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.
14IMX_DEFAULT_BOOTLOADER = "u-boot-fslc"
15
16UBOOT_MAKE_TARGET = "u-boot.sb"
17UBOOT_SUFFIX = "sb"
18
12UBOOT_MACHINE = "mx23evk_config" 19UBOOT_MACHINE = "mx23evk_config"
13 20
14KERNEL_DEVICETREE = "imx23-evk.dtb" 21KERNEL_DEVICETREE = "imx23-evk.dtb"
diff --git a/conf/machine/imx25pdk.conf b/conf/machine/imx25pdk.conf
index 9e8ad003..5721e845 100644
--- a/conf/machine/imx25pdk.conf
+++ b/conf/machine/imx25pdk.conf
@@ -9,6 +9,13 @@ MACHINEOVERRIDES =. "mx25:"
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/tune-arm926ejs.inc
11 11
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.
14IMX_DEFAULT_BOOTLOADER = "u-boot-fslc"
15
16UBOOT_MAKE_TARGET = "u-boot.imx"
17UBOOT_SUFFIX = "imx"
18
12UBOOT_MACHINE ?= "mx25pdk_defconfig" 19UBOOT_MACHINE ?= "mx25pdk_defconfig"
13 20
14KERNEL_DEVICETREE = "imx25-pdk.dtb" 21KERNEL_DEVICETREE = "imx25-pdk.dtb"
diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index d6153dfa..4f69dae4 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -9,6 +9,13 @@ MACHINEOVERRIDES =. "mxs:mx28:"
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/tune-arm926ejs.inc
11 11
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.
14IMX_DEFAULT_BOOTLOADER = "u-boot-fslc"
15
16UBOOT_MAKE_TARGET = "u-boot.sb"
17UBOOT_SUFFIX = "sb"
18
12UBOOT_CONFIG ??= "sd" 19UBOOT_CONFIG ??= "sd"
13UBOOT_CONFIG[sd] = "mx28evk_config,sdcard" 20UBOOT_CONFIG[sd] = "mx28evk_config,sdcard"
14UBOOT_CONFIG[nand] = "mx28evk_nand_config,ubifs" 21UBOOT_CONFIG[nand] = "mx28evk_nand_config,ubifs"
diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
index 5741f2e2..80d7b386 100644
--- a/conf/machine/imx51evk.conf
+++ b/conf/machine/imx51evk.conf
@@ -11,4 +11,11 @@ include conf/machine/include/tune-cortexa8.inc
11 11
12KERNEL_DEVICETREE = "imx51-babbage.dtb" 12KERNEL_DEVICETREE = "imx51-babbage.dtb"
13 13
14# This machine is not supported by u-boot-imx as it is not tested by NXP on this
15# board. So we force it to use u-boot-fslc which is based on mainline here.
16IMX_DEFAULT_BOOTLOADER = "u-boot-fslc"
17
18UBOOT_MAKE_TARGET = "u-boot.imx"
19UBOOT_SUFFIX = "imx"
20
14UBOOT_MACHINE = "mx51evk_config" 21UBOOT_MACHINE = "mx51evk_config"
diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index c6d7f0d9..af5aeb3b 100644
--- a/conf/machine/imx53ard.conf
+++ b/conf/machine/imx53ard.conf
@@ -13,9 +13,16 @@ include conf/machine/include/tune-cortexa8.inc
13PERF_FEATURES_ENABLE = "" 13PERF_FEATURES_ENABLE = ""
14 14
15KERNEL_DEVICETREE = "imx53-ard.dtb" 15KERNEL_DEVICETREE = "imx53-ard.dtb"
16KERNEL_IMAGETYPE = "uImage"
17
18# This machine is not supported by u-boot-imx as it is not tested by NXP on this
19# board. So we force it to use u-boot-fslc which is based on mainline here.
20IMX_DEFAULT_BOOTLOADER = "u-boot-fslc"
21
22UBOOT_MAKE_TARGET = "u-boot.imx"
23UBOOT_SUFFIX = "imx"
16 24
17UBOOT_MACHINE = "mx53ard_config" 25UBOOT_MACHINE = "mx53ard_config"
18KERNEL_IMAGETYPE = "uImage"
19 26
20MACHINE_FIRMWARE += "linux-firmware-ar3k \ 27MACHINE_FIRMWARE += "linux-firmware-ar3k \
21 linux-firmware-ath6k" 28 linux-firmware-ath6k"
diff --git a/conf/machine/imx53qsb.conf b/conf/machine/imx53qsb.conf
index 24cbfac6..06d4a756 100644
--- a/conf/machine/imx53qsb.conf
+++ b/conf/machine/imx53qsb.conf
@@ -11,6 +11,13 @@ include conf/machine/include/tune-cortexa8.inc
11 11
12KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb" 12KERNEL_DEVICETREE = "imx53-qsb.dtb imx53-qsrb.dtb"
13 13
14# This machine is not supported by u-boot-imx as it is not tested by NXP on this
15# board. So we force it to use u-boot-fslc which is based on mainline here.
16IMX_DEFAULT_BOOTLOADER = "u-boot-fslc"
17
18UBOOT_MAKE_TARGET = "u-boot.imx"
19UBOOT_SUFFIX = "imx"
20
14UBOOT_MACHINE = "mx53loco_config" 21UBOOT_MACHINE = "mx53loco_config"
15 22
16MACHINE_FIRMWARE = "linux-firmware-ar3k \ 23MACHINE_FIRMWARE = "linux-firmware-ar3k \
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index d4d0979b..b7aec8c2 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -32,17 +32,25 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
32 imx6dl-sabreauto.dtb \ 32 imx6dl-sabreauto.dtb \
33" 33"
34 34
35UBOOT_MACHINE ?= "mx6sabreauto_defconfig" 35### u-boot-fslc settings ###
36 36
37# Use fslc u-boot by default. See also imx-base.inc. 37SPL_BINARY_pn-u-boot-fslc = "SPL"
38UBOOT_MAKE_TARGET = "all" 38UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabreauto_defconfig"
39UBOOT_SUFFIX = "img" 39UBOOT_SUFFIX_pn-u-boot-fslc = "img"
40SPL_BINARY = "SPL" 40
41WKS_FILE = "imx-uboot-spl-bootpart.wks.in" 41### u-boot-imx settings ###
42 42
43# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC 43# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
44# variants. Change the defconfig to the targeted SoC variant. 44# variants. Change the defconfig to the targeted SoC variant.
45SPL_BINARY_pn-u-boot-imx = ""
45UBOOT_MACHINE_pn-u-boot-imx = "mx6qsabreauto_defconfig" 46UBOOT_MACHINE_pn-u-boot-imx = "mx6qsabreauto_defconfig"
47UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx"
48UBOOT_SUFFIX_pn-u-boot-imx = "imx"
49
50WKS_FILE = " \
51 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
52 'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \
53 'imx-uboot-bootpart.wks.in', d)}"
46 54
47SERIAL_CONSOLES = "115200;ttymxc3" 55SERIAL_CONSOLES = "115200;ttymxc3"
48 56
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index baf2192b..b3d09e93 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -41,17 +41,25 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
41 imx6dl-sabresd.dtb \ 41 imx6dl-sabresd.dtb \
42" 42"
43 43
44UBOOT_MACHINE ?= "mx6sabresd_defconfig" 44### u-boot-fslc settings ###
45 45
46# Use fslc u-boot by default. See also imx-base.inc. 46SPL_BINARY_pn-u-boot-fslc = "SPL"
47UBOOT_MAKE_TARGET = "all" 47UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabresd_defconfig"
48UBOOT_SUFFIX = "img" 48UBOOT_SUFFIX_pn-u-boot-fslc = "img"
49SPL_BINARY = "SPL" 49
50WKS_FILE = "imx-uboot-spl-bootpart.wks.in" 50### u-boot-imx settings ###
51 51
52# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC 52# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
53# variants. Change the defconfig to the targeted SoC variant. 53# variants. Change the defconfig to the targeted SoC variant.
54UBOOT_MACHINE_pn-u-boot-imx = "mx6qsabresd_defconfig" 54SPL_BINARY_pn-u-boot-imx = ""
55UBOOT_MACHINE_pn-u-boot-imx ?= "mx6qsabresd_defconfig"
56UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx"
57UBOOT_SUFFIX_pn-u-boot-imx = "imx"
58
59WKS_FILE = " \
60 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
61 'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \
62 'imx-uboot-bootpart.wks.in', d)}"
55 63
56SERIAL_CONSOLES = "115200;ttymxc0" 64SERIAL_CONSOLES = "115200;ttymxc0"
57 65
diff --git a/conf/machine/imx6slevk.conf b/conf/machine/imx6slevk.conf
index d1c0e457..1e8c403b 100644
--- a/conf/machine/imx6slevk.conf
+++ b/conf/machine/imx6slevk.conf
@@ -17,6 +17,9 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
17 imx6sl-evk-uart.dtb \ 17 imx6sl-evk-uart.dtb \
18" 18"
19 19
20UBOOT_MAKE_TARGET = "u-boot.imx"
21UBOOT_SUFFIX = "imx"
22
20UBOOT_CONFIG ??= " \ 23UBOOT_CONFIG ??= " \
21 sd \ 24 sd \
22 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ 25 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
diff --git a/conf/machine/imx6sllevk.conf b/conf/machine/imx6sllevk.conf
index 23724f5e..30b537f1 100644
--- a/conf/machine/imx6sllevk.conf
+++ b/conf/machine/imx6sllevk.conf
@@ -11,6 +11,9 @@ include conf/machine/include/tune-cortexa9.inc
11 11
12KERNEL_DEVICETREE = "imx6sll-evk.dtb" 12KERNEL_DEVICETREE = "imx6sll-evk.dtb"
13 13
14UBOOT_MAKE_TARGET = "u-boot.imx"
15UBOOT_SUFFIX = "imx"
16
14UBOOT_CONFIG ??= " \ 17UBOOT_CONFIG ??= " \
15 sd \ 18 sd \
16 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ 19 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
diff --git a/conf/machine/imx6sxsabreauto.conf b/conf/machine/imx6sxsabreauto.conf
index e8fede4a..f7031ccb 100644
--- a/conf/machine/imx6sxsabreauto.conf
+++ b/conf/machine/imx6sxsabreauto.conf
@@ -12,8 +12,8 @@ require conf/machine/include/tune-cortexa9.inc
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
15PREFERRED_PROVIDER_u-boot = "u-boot-fslc" 15UBOOT_MAKE_TARGET = "u-boot.imx"
16PREFERRED_PROVIDER_virtual/bootloader = "u-boot-fslc" 16UBOOT_SUFFIX = "imx"
17 17
18UBOOT_CONFIG ??= " \ 18UBOOT_CONFIG ??= " \
19 sd \ 19 sd \
diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index 73b458ac..ff7d6ae6 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -25,6 +25,9 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
25 imx6sx-sdb-reva-ldo.dtb \ 25 imx6sx-sdb-reva-ldo.dtb \
26" 26"
27 27
28UBOOT_MAKE_TARGET = "u-boot.imx"
29UBOOT_SUFFIX = "imx"
30
28UBOOT_CONFIG ??= " \ 31UBOOT_CONFIG ??= " \
29 sd \ 32 sd \
30 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ 33 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index a8acb43d..88a6d566 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -23,11 +23,23 @@ KERNEL_DEVICETREE = " \
23" 23"
24KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb" 24KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb"
25 25
26# Use fslc u-boot by default. See also imx-base.inc. 26### u-boot-fslc settings ###
27UBOOT_MAKE_TARGET = "" 27
28UBOOT_SUFFIX = "img" 28SPL_BINARY_pn-u-boot-fslc = "SPL"
29SPL_BINARY = "SPL" 29UBOOT_SUFFIX_pn-u-boot-fslc = "img"
30WKS_FILE = "imx-uboot-spl-bootpart.wks.in" 30
31### u-boot-imx settings ###
32
33# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
34# variants. Change the defconfig to the targeted SoC variant.
35SPL_BINARY_pn-u-boot-imx = ""
36UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx"
37UBOOT_SUFFIX_pn-u-boot-imx = "imx"
38
39WKS_FILE = " \
40 ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
41 'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \
42 'imx-uboot-bootpart.wks.in', d)}"
31 43
32UBOOT_CONFIG ??= " \ 44UBOOT_CONFIG ??= " \
33 sd \ 45 sd \
diff --git a/conf/machine/imx6ullevk.conf b/conf/machine/imx6ullevk.conf
index 7d5f62d1..bd592a20 100644
--- a/conf/machine/imx6ullevk.conf
+++ b/conf/machine/imx6ullevk.conf
@@ -22,6 +22,9 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
22 imx6ull-14x14-evk-gpmi-weim.dtb \ 22 imx6ull-14x14-evk-gpmi-weim.dtb \
23" 23"
24 24
25UBOOT_MAKE_TARGET = "u-boot.imx"
26UBOOT_SUFFIX = "imx"
27
25UBOOT_CONFIG ??= " \ 28UBOOT_CONFIG ??= " \
26 sd \ 29 sd \
27 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ 30 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
diff --git a/conf/machine/imx6ulz-14x14-evk.conf b/conf/machine/imx6ulz-14x14-evk.conf
index 12f64d48..7b794e7c 100644
--- a/conf/machine/imx6ulz-14x14-evk.conf
+++ b/conf/machine/imx6ulz-14x14-evk.conf
@@ -20,6 +20,9 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
20 imx6ulz-14x14-evk-gpmi-weim.dtb \ 20 imx6ulz-14x14-evk-gpmi-weim.dtb \
21" 21"
22 22
23UBOOT_MAKE_TARGET = "u-boot.imx"
24UBOOT_SUFFIX = "imx"
25
23UBOOT_CONFIG ??= " \ 26UBOOT_CONFIG ??= " \
24 sd \ 27 sd \
25 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ 28 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
diff --git a/conf/machine/imx7dsabresd.conf b/conf/machine/imx7dsabresd.conf
index a172aa49..e848f294 100644
--- a/conf/machine/imx7dsabresd.conf
+++ b/conf/machine/imx7dsabresd.conf
@@ -24,6 +24,8 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
24 imx7d-sdb-usd-wifi.dtb \ 24 imx7d-sdb-usd-wifi.dtb \
25" 25"
26 26
27UBOOT_MAKE_TARGET = "u-boot.imx"
28UBOOT_SUFFIX = "imx"
27 29
28UBOOT_CONFIG ??= " \ 30UBOOT_CONFIG ??= " \
29 sd \ 31 sd \
diff --git a/conf/machine/imx7ulpevk.conf b/conf/machine/imx7ulpevk.conf
index 7bb70012..a587f44b 100644
--- a/conf/machine/imx7ulpevk.conf
+++ b/conf/machine/imx7ulpevk.conf
@@ -31,6 +31,9 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
31 imx7ulp-evkb-spi-slave.dtb \ 31 imx7ulp-evkb-spi-slave.dtb \
32" 32"
33 33
34UBOOT_MAKE_TARGET = "u-boot.imx"
35UBOOT_SUFFIX = "imx"
36
34UBOOT_CONFIG ??= " \ 37UBOOT_CONFIG ??= " \
35 sd \ 38 sd \
36 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ 39 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
diff --git a/conf/machine/imx8dxl-evk.conf b/conf/machine/imx8dxl-evk.conf
index 84ab5315..5d177aa3 100644
--- a/conf/machine/imx8dxl-evk.conf
+++ b/conf/machine/imx8dxl-evk.conf
@@ -37,8 +37,13 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
37ATF_PLATFORM = "imx8dxl" 37ATF_PLATFORM = "imx8dxl"
38IMX_BOOT_SOC_TARGET = "iMX8DXL" 38IMX_BOOT_SOC_TARGET = "iMX8DXL"
39 39
40# This machine is not supported by u-boot-fslc, so we force it to use
41# u-boot-imx here.
42IMX_DEFAULT_BOOTLOADER = "u-boot-imx"
43
40UBOOT_MAKE_TARGET = "all" 44UBOOT_MAKE_TARGET = "all"
41SPL_BINARY = "spl/u-boot-spl.bin" 45SPL_BINARY = "spl/u-boot-spl.bin"
46UBOOT_SUFFIX = "bin"
42 47
43UBOOT_CONFIG ??= "sd" 48UBOOT_CONFIG ??= "sd"
44UBOOT_CONFIG[sd] = "imx8dxl_evk_defconfig,sdcard" 49UBOOT_CONFIG[sd] = "imx8dxl_evk_defconfig,sdcard"
diff --git a/conf/machine/imx8mp-evk.conf b/conf/machine/imx8mp-evk.conf
index cee36a5a..8dbbe8d0 100644
--- a/conf/machine/imx8mp-evk.conf
+++ b/conf/machine/imx8mp-evk.conf
@@ -42,6 +42,11 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
42 freescale/imx8mp-evk-spdif-lb.dtb \ 42 freescale/imx8mp-evk-spdif-lb.dtb \
43" 43"
44 44
45IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx"
46IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc"
47
48UBOOT_SUFFIX = "bin"
49
45UBOOT_CONFIG ??= "sd" 50UBOOT_CONFIG ??= "sd"
46UBOOT_CONFIG[sd] = "imx8mp_evk_defconfig,sdcard" 51UBOOT_CONFIG[sd] = "imx8mp_evk_defconfig,sdcard"
47UBOOT_CONFIG[fspi] = "imx8mp_evk_defconfig" 52UBOOT_CONFIG[fspi] = "imx8mp_evk_defconfig"
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index 24aa88db..9907ef4b 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -40,6 +40,11 @@ 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"
44IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc"
45
46UBOOT_SUFFIX = "bin"
47
43UBOOT_CONFIG ??= "sd" 48UBOOT_CONFIG ??= "sd"
44UBOOT_CONFIG[sd] = "imx8mq_evk_config,sdcard" 49UBOOT_CONFIG[sd] = "imx8mq_evk_config,sdcard"
45UBOOT_CONFIG[mfgtool] = "imx8mq_evk_config" 50UBOOT_CONFIG[mfgtool] = "imx8mq_evk_config"
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index e4f45d85..5ceb6b8b 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -55,6 +55,9 @@ 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"
59IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc"
60
58UBOOT_SUFFIX = "bin" 61UBOOT_SUFFIX = "bin"
59 62
60UBOOT_CONFIG ??= "sd" 63UBOOT_CONFIG ??= "sd"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 4790005b..d52123e2 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -18,7 +18,50 @@ IMX_DEFAULT_BSP_mx5 ?= "mainline"
18 18
19MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:" 19MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:"
20 20
21# UBOOT_BINARY is used inside the wks files to dynamically find the required
22# U-Boot file.
23UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
24
25# Using the 'IMX_DEFAULT_BOOTLOADER' the machine can support multiple bootloader
26# versions. This is done for NXP reference board where we support 'u-boot-fslc'
27# and 'u-boot-imx'.
28#
29# So, for example in imx6qdlsabresd, we support both flavor and for this we
30# define:
31#
32# ,----[ imx6qdlsabresd.conf ]
33# | ### u-boot-fslc settings ###
34# |
35# | SPL_BINARY_pn-u-boot-fslc = "SPL"
36# | UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabresd_defconfig"
37# | UBOOT_SUFFIX_pn-u-boot-fslc = "img"
38# |
39# | ### u-boot-imx settings ###
40# |
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.
43# | UBOOT_MACHINE_pn-u-boot-imx ?= "mx6qsabresd_defconfig"
44# | UBOOT_SUFFIX_pn-u-boot-imx = "imx"
45# `----
46#
47# As result, the 'UBOOT_SUFFIX' is dynamically set based on the preferred U-Boot
48# flavor to use.
49#
50# For machines where one of the flavors is required, we can force it. An example
51# is the imx53qsb, which we define:
52#
53# ,----[ imx53qsb.conf ]
54# | # This machine is not supported by u-boot-imx as it is not tested by NXP on this
55# | # board. So we force it to use u-boot-fslc which is based on mainline here.
56# | IMX_DEFAULT_BOOTLOADER = "u-boot-fslc"
57# |
58# | UBOOT_MAKE_TARGET = "u-boot.imx"
59# | UBOOT_SUFFIX = "imx"
60# |
61# | UBOOT_MACHINE = "mx53loco_config"
62# `----
21IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc" 63IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc"
64UBOOT_SUFFIX ?= "${UBOOT_SUFFIX_pn-${IMX_DEFAULT_BOOTLOADER}}"
22 65
23IMX_DEFAULT_UBOOTTOOLS = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-tools', 'u-boot-tools', d)}" 66IMX_DEFAULT_UBOOTTOOLS = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-tools', 'u-boot-tools', d)}"
24 67
@@ -32,16 +75,6 @@ PREFERRED_PROVIDER_virtual/bootloader ??= "${IMX_DEFAULT_BOOTLOADER}"
32 75
33PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native" 76PREFERRED_PROVIDER_u-boot-mxsboot-native ??= "u-boot-fslc-mxsboot-native"
34 77
35# Set specific make target and binary suffix
36UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
37UBOOT_MAKE_TARGET ?= "u-boot.${UBOOT_SUFFIX}"
38UBOOT_MAKE_TARGET_mxs ?= "u-boot.sb"
39UBOOT_MAKE_TARGET_mx8 ?= ""
40
41UBOOT_SUFFIX ?= "imx"
42UBOOT_SUFFIX_mxs ?= "sb"
43UBOOT_SUFFIX_mx8 ?= "bin"
44
45UBOOT_ENTRYPOINT_mxs = "0x40008000" 78UBOOT_ENTRYPOINT_mxs = "0x40008000"
46UBOOT_ENTRYPOINT_mx51 = "0x90008000" 79UBOOT_ENTRYPOINT_mx51 = "0x90008000"
47UBOOT_ENTRYPOINT_mx53 = "0x70008000" 80UBOOT_ENTRYPOINT_mx53 = "0x70008000"
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 619ad663..9b590fe0 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -22,6 +22,11 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
22" 22"
23UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" 23UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
24 24
25IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx"
26IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc"
27
28UBOOT_SUFFIX = "bin"
29
25UBOOT_CONFIG ??= "sd" 30UBOOT_CONFIG ??= "sd"
26UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" 31UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
27UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig" 32UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig"
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index ad4f5dea..6a5b31f7 100644
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -22,6 +22,11 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
22" 22"
23UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb" 23UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
24 24
25IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx"
26IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc"
27
28UBOOT_SUFFIX = "bin"
29
25UBOOT_CONFIG ??= "sd" 30UBOOT_CONFIG ??= "sd"
26UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard" 31UBOOT_CONFIG[sd] = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
27UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig" 32UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig"
diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc
index 490e00db..814a34c1 100644
--- a/conf/machine/include/imx8x-mek.inc
+++ b/conf/machine/include/imx8x-mek.inc
@@ -54,6 +54,11 @@ UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig"
54 54
55IMX_BOOT_SEEK = "32" 55IMX_BOOT_SEEK = "32"
56 56
57# This machine is not supported by u-boot-fslc, so we force it to use
58# u-boot-imx here.
59IMX_DEFAULT_BOOTLOADER = "u-boot-imx"
60UBOOT_SUFFIX = "bin"
61
57# Set ATF platform name 62# Set ATF platform name
58ATF_PLATFORM = "imx8qx" 63ATF_PLATFORM = "imx8qx"
59 64