Merge pull request #1494 from Freescale/fix/issue-1290

imx6qdlsabre*: ensure UBOOT_CONFIG setting is always available

2 files changed, 10 insertions, 10 deletions

diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 3c6fd151..e8fcf13b 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -32,17 +32,17 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \
     imx6dl-sabreauto.dtb \
 "
 
+UBOOT_CONFIG ??= " \
+    sd \
+    ${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', \
+           bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d), '')}"
+
 ### u-boot-fslc settings ###
 SPL_BINARY:pn-u-boot-fslc = "SPL"
-UBOOT_CONFIG:pn-u-boot-fslc ??= "sd"
 UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 
 ### u-boot-imx settings ###
 SPL_BINARY:pn-u-boot-imx = ""
-UBOOT_CONFIG:pn-u-boot-imx ??= " \
-    sd \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
-"
 UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
 UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx"
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 = " \
     imx6dl-sabresd.dtb \
 "
 
+UBOOT_CONFIG ??= " \
+    sd \
+    ${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', \
+           bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d), '')}"
+
 ### u-boot-fslc settings ###
 SPL_BINARY:pn-u-boot-fslc = "SPL"
-UBOOT_CONFIG:pn-u-boot-fslc ??= "sd"
 UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 
 ### u-boot-imx settings ###
 SPL_BINARY:pn-u-boot-imx = ""
-UBOOT_CONFIG:pn-u-boot-imx ??= " \
-    sd \
-    ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \
-"
 UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
 UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 UBOOT_MAKE_TARGET:pn-u-boot-imx-mfgtool = "u-boot.imx"