From b6189fef854cfe375feb9077a15c5fb7c863ca73 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 12 Apr 2021 22:13:13 -0300 Subject: imx-base.inc: Allow use of SPL_BINARY variable inside wic images Fixes: 776932e1 ("Rework the u-boot-fslc and u-boot-imx settings logic") Signed-off-by: Otavio Salvador --- conf/machine/include/imx-base.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index f12cc276..2b434133 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -63,6 +63,10 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc" UBOOT_SUFFIX ?= "${UBOOT_SUFFIX_pn-${IMX_DEFAULT_BOOTLOADER}}" +# We need to export the original variable to allow it to be used when generating +# wic based images. +SPL_BINARY ?= "${SPL_BINARY_pn-${IMX_DEFAULT_BOOTLOADER}}" + IMX_DEFAULT_UBOOTTOOLS = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-tools', 'u-boot-tools', d)}" IMX_DEFAULT_MFGTOOL = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-mfgtool', 'u-boot-fslc', d)}" -- cgit v1.2.3-54-g00ecf