From 06fbf0e23c8f86742ed5000f953bd7a974a061d8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 12 Apr 2023 20:43:38 -0300 Subject: imx6qdlsabre*: ensure UBOOT_CONFIG setting is always available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- conf/machine/imx6qdlsabreauto.conf | 10 +++++----- conf/machine/imx6qdlsabresd.conf | 10 +++++----- 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 = " \ imx6dl-sabreauto.dtb \ " +UBOOT_CONFIG ??= " \ + sd \ + ${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', \ + bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d), '')}" + ### u-boot-fslc settings ### SPL_BINARY:pn-u-boot-fslc = "SPL" -UBOOT_CONFIG:pn-u-boot-fslc ??= "sd" UBOOT_SUFFIX:pn-u-boot-fslc = "img" ### u-boot-imx settings ### SPL_BINARY:pn-u-boot-imx = "" -UBOOT_CONFIG:pn-u-boot-imx ??= " \ - sd \ - ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ -" UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" UBOOT_SUFFIX:pn-u-boot-imx = "imx" UBOOT_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 = " \ imx6dl-sabresd.dtb \ " +UBOOT_CONFIG ??= " \ + sd \ + ${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', \ + bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d), '')}" + ### u-boot-fslc settings ### SPL_BINARY:pn-u-boot-fslc = "SPL" -UBOOT_CONFIG:pn-u-boot-fslc ??= "sd" UBOOT_SUFFIX:pn-u-boot-fslc = "img" ### u-boot-imx settings ### SPL_BINARY:pn-u-boot-imx = "" -UBOOT_CONFIG:pn-u-boot-imx ??= " \ - sd \ - ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \ -" UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" UBOOT_SUFFIX:pn-u-boot-imx = "imx" UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx" -- cgit v1.2.3-54-g00ecf