diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2021-04-12 22:13:13 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2021-04-13 17:29:25 -0300 |
commit | f98059fef8cf4ca95f19c6a80e567fb44ba1a219 (patch) | |
tree | d26bf6932dd9249170c0e3536f46b57d47a142eb /conf/machine/include | |
parent | a1952664603583e82025a00f5f0335d899c5b1c9 (diff) | |
download | meta-freescale-f98059fef8cf4ca95f19c6a80e567fb44ba1a219.tar.gz |
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 <otavio@ossystems.com.br>
Diffstat (limited to 'conf/machine/include')
-rw-r--r-- | conf/machine/include/imx-base.inc | 4 |
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}" | |||
63 | IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc" | 63 | IMX_DEFAULT_BOOTLOADER ??= "u-boot-fslc" |
64 | UBOOT_SUFFIX ?= "${UBOOT_SUFFIX_pn-${IMX_DEFAULT_BOOTLOADER}}" | 64 | UBOOT_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. | ||
68 | SPL_BINARY ?= "${SPL_BINARY_pn-${IMX_DEFAULT_BOOTLOADER}}" | ||
69 | |||
66 | IMX_DEFAULT_UBOOTTOOLS = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-tools', 'u-boot-tools', d)}" | 70 | IMX_DEFAULT_UBOOTTOOLS = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-tools', 'u-boot-tools', d)}" |
67 | IMX_DEFAULT_MFGTOOL = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-mfgtool', 'u-boot-fslc', d)}" | 71 | IMX_DEFAULT_MFGTOOL = "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx','u-boot-imx-mfgtool', 'u-boot-fslc', d)}" |
68 | 72 | ||