diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2021-04-14 14:58:39 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2021-04-14 15:30:24 -0300 |
commit | fdc5757955249461f81b2cb9e77fcd9dde3f50ce (patch) | |
tree | fca17f3563537dfce90a9417619d61ebc4ba6dd7 /conf/machine/include/imx-base.inc | |
parent | 00b168fbba0426b80a5f97ef377550efc6ea1d80 (diff) | |
download | meta-freescale-topic/fix-spl-binary.tar.gz |
imx-base.inc: Provide a default value for SPL_BINARYtopic/fix-spl-binary
This fixes the build case when machine does not use SPL and does not set
it. We couldn't use dynamic expansion or we trigger a recursive
expansion so we opted to use an utility function to do the proper logic.
Fixes: f98059fe ("imx-base.inc: Allow use of SPL_BINARY variable inside wic images")
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf/machine/include/imx-base.inc')
-rw-r--r-- | conf/machine/include/imx-base.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 2b434133..14008927 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -65,7 +65,7 @@ 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 | 66 | # We need to export the original variable to allow it to be used when generating |
67 | # wic based images. | 67 | # wic based images. |
68 | SPL_BINARY ?= "${SPL_BINARY_pn-${IMX_DEFAULT_BOOTLOADER}}" | 68 | SPL_BINARY ??= "${@get_spl_binary(d)}" |
69 | 69 | ||
70 | 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)}" |
71 | 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)}" |