summaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2023-04-12 20:43:38 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2023-04-12 20:43:38 -0300
commit06fbf0e23c8f86742ed5000f953bd7a974a061d8 (patch)
treee7275758335462f10e8d74fb5a42b2f8a9d3145e /conf/machine
parent56ba9c32d6b3029fb1c2b3fc8ea8778d62f396a8 (diff)
downloadmeta-freescale-06fbf0e23c8f86742ed5000f953bd7a974a061d8.tar.gz
imx6qdlsabre*: ensure UBOOT_CONFIG setting is always availablefix/issue-1290
We cannot tie the UBOOT_CONFIG setting to the U-Boot recipe otherwise if kernel-fitimage is added in KERNEL_CLASSES, the following build errors is raised: ,---- | Nothing PROVIDES ‘virtual/kernel’ | ... | Either UBOOT_MACHINE or UBOOT_CONFIG must be set in the imx6qdlsabresd machine configuration. `---- kernel-fitimage class inherits uboot-sign which inherits uboot-config. uboot-config class checks UBOOT_CONFIG and it is not defined. The fix is essentially to move the conditional for the variable assignment instead of using the recipe override. Fixes: #1290 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/imx6qdlsabreauto.conf10
-rw-r--r--conf/machine/imx6qdlsabresd.conf10
2 files changed, 10 insertions, 10 deletions
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 3c6fd151..e8fcf13b 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -32,17 +32,17 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \
32 imx6dl-sabreauto.dtb \ 32 imx6dl-sabreauto.dtb \
33" 33"
34 34
35UBOOT_CONFIG ??= " \
36 sd \
37 ${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', \
38 bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d), '')}"
39
35### u-boot-fslc settings ### 40### u-boot-fslc settings ###
36SPL_BINARY:pn-u-boot-fslc = "SPL" 41SPL_BINARY:pn-u-boot-fslc = "SPL"
37UBOOT_CONFIG:pn-u-boot-fslc ??= "sd"
38UBOOT_SUFFIX:pn-u-boot-fslc = "img" 42UBOOT_SUFFIX:pn-u-boot-fslc = "img"
39 43
40### u-boot-imx settings ### 44### u-boot-imx settings ###
41SPL_BINARY:pn-u-boot-imx = "" 45SPL_BINARY:pn-u-boot-imx = ""
42UBOOT_CONFIG:pn-u-boot-imx ??= " \
43 sd \
44 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
45"
46UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" 46UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
47UBOOT_SUFFIX:pn-u-boot-imx = "imx" 47UBOOT_SUFFIX:pn-u-boot-imx = "imx"
48UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx" 48UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx"
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 046a7c7f..415b003c 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -41,17 +41,17 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \
41 imx6dl-sabresd.dtb \ 41 imx6dl-sabresd.dtb \
42" 42"
43 43
44UBOOT_CONFIG ??= " \
45 sd \
46 ${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', \
47 bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d), '')}"
48
44### u-boot-fslc settings ### 49### u-boot-fslc settings ###
45SPL_BINARY:pn-u-boot-fslc = "SPL" 50SPL_BINARY:pn-u-boot-fslc = "SPL"
46UBOOT_CONFIG:pn-u-boot-fslc ??= "sd"
47UBOOT_SUFFIX:pn-u-boot-fslc = "img" 51UBOOT_SUFFIX:pn-u-boot-fslc = "img"
48 52
49### u-boot-imx settings ### 53### u-boot-imx settings ###
50SPL_BINARY:pn-u-boot-imx = "" 54SPL_BINARY:pn-u-boot-imx = ""
51UBOOT_CONFIG:pn-u-boot-imx ??= " \
52 sd \
53 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
54"
55UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" 55UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
56UBOOT_SUFFIX:pn-u-boot-imx = "imx" 56UBOOT_SUFFIX:pn-u-boot-imx = "imx"
57UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx" 57UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx"