Rework the u-boot-fslc and u-boot-imx settings logic

We need to make it more obvious what is in use, when we support both
bootloaders and for it we are now using the _pn suffix for both.

This also fixes the WIC_FILE depending on the choice otherwise image
build fails.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

1 files changed, 15 insertions, 7 deletions

diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index baf2192b..b3d09e93 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -41,17 +41,25 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
     imx6dl-sabresd.dtb \
 "
 
-UBOOT_MACHINE ?= "mx6sabresd_defconfig"
+### u-boot-fslc settings ###
 
-# Use fslc u-boot by default. See also imx-base.inc.
-UBOOT_MAKE_TARGET = "all"
-UBOOT_SUFFIX = "img"
-SPL_BINARY = "SPL"
-WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
+SPL_BINARY_pn-u-boot-fslc = "SPL"
+UBOOT_MACHINE_pn-u-boot-fslc ?= "mx6sabresd_defconfig"
+UBOOT_SUFFIX_pn-u-boot-fslc = "img"
+
+### u-boot-imx settings ###
 
 # The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
 # variants. Change the defconfig to the targeted SoC variant.
-UBOOT_MACHINE_pn-u-boot-imx = "mx6qsabresd_defconfig"
+SPL_BINARY_pn-u-boot-imx = ""
+UBOOT_MACHINE_pn-u-boot-imx ?= "mx6qsabresd_defconfig"
+UBOOT_MAKE_TARGET_pn-u-boot-imx = "u-boot.imx"
+UBOOT_SUFFIX_pn-u-boot-imx = "imx"
+
+WKS_FILE = " \
+    ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
+                         'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \
+                                        'imx-uboot-bootpart.wks.in', d)}"
 
 SERIAL_CONSOLES = "115200;ttymxc0"