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, 3 insertions, 0 deletions

diff --git a/conf/machine/imx6sxsabresd.conf b/conf/machine/imx6sxsabresd.conf
index 73b458ac..ff7d6ae6 100644
--- a/conf/machine/imx6sxsabresd.conf
+++ b/conf/machine/imx6sxsabresd.conf
@@ -25,6 +25,9 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
     imx6sx-sdb-reva-ldo.dtb \
 "
 
+UBOOT_MAKE_TARGET = "u-boot.imx"
+UBOOT_SUFFIX = "imx"
+
 UBOOT_CONFIG ??= " \
     sd \
     ${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'sd-optee', '', d)} \