summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2021-04-12 22:13:13 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2021-04-12 23:52:57 -0300
commitb6189fef854cfe375feb9077a15c5fb7c863ca73 (patch)
tree41ef233302aad105baff568bb9848131283dc995
parentef72b25a7253304dff1e8c090e33384e9f934983 (diff)
downloadmeta-freescale-topic/fix-bootloader-advanced-use.tar.gz
imx-base.inc: Allow use of SPL_BINARY variable inside wic imagestopic/fix-bootloader-advanced-use
Fixes: 776932e1 ("Rework the u-boot-fslc and u-boot-imx settings logic") Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--conf/machine/include/imx-base.inc4
1 files changed, 4 insertions, 0 deletions
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}"
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
67# wic based images.
68SPL_BINARY ?= "${SPL_BINARY_pn-${IMX_DEFAULT_BOOTLOADER}}"
69
66IMX_DEFAULT_UBOOTTOOLS = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-tools', 'u-boot-tools', d)}" 70IMX_DEFAULT_UBOOTTOOLS = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-tools', 'u-boot-tools', d)}"
67IMX_DEFAULT_MFGTOOL = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-mfgtool', 'u-boot-fslc', d)}" 71IMX_DEFAULT_MFGTOOL = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-mfgtool', 'u-boot-fslc', d)}"
68 72