summaryrefslogtreecommitdiffstats
path: root/conf/machine/imx6qdlsabresd.conf
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2023-04-13 08:13:37 -0300
committerGitHub <noreply@github.com>2023-04-13 08:13:37 -0300
commit19b3aceb1c8fefc437d291ea595b51f473cca689 (patch)
treeacdff9ed1f8eed10704b78e4a2d226681390cff7 /conf/machine/imx6qdlsabresd.conf
parent29ec7eaebd34f752d166e8cbcf665da908c9e47c (diff)
parent06fbf0e23c8f86742ed5000f953bd7a974a061d8 (diff)
downloadmeta-freescale-19b3aceb1c8fefc437d291ea595b51f473cca689.tar.gz
Merge pull request #1494 from Freescale/fix/issue-1290
imx6qdlsabre*: ensure UBOOT_CONFIG setting is always available
Diffstat (limited to 'conf/machine/imx6qdlsabresd.conf')
-rw-r--r--conf/machine/imx6qdlsabresd.conf10
1 files changed, 5 insertions, 5 deletions
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 = " \
41 imx6dl-sabresd.dtb \ 41 imx6dl-sabresd.dtb \
42" 42"
43 43
44UBOOT_CONFIG ??= " \
45 sd \
46 ${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', \
47 bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d), '')}"
48
44### u-boot-fslc settings ### 49### u-boot-fslc settings ###
45SPL_BINARY:pn-u-boot-fslc = "SPL" 50SPL_BINARY:pn-u-boot-fslc = "SPL"
46UBOOT_CONFIG:pn-u-boot-fslc ??= "sd"
47UBOOT_SUFFIX:pn-u-boot-fslc = "img" 51UBOOT_SUFFIX:pn-u-boot-fslc = "img"
48 52
49### u-boot-imx settings ### 53### u-boot-imx settings ###
50SPL_BINARY:pn-u-boot-imx = "" 54SPL_BINARY:pn-u-boot-imx = ""
51UBOOT_CONFIG:pn-u-boot-imx ??= " \
52 sd \
53 ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
54"
55UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx" 55UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
56UBOOT_SUFFIX:pn-u-boot-imx = "imx" 56UBOOT_SUFFIX:pn-u-boot-imx = "imx"
57UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx" 57UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx"