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

diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index 24aa88db..9907ef4b 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -40,6 +40,11 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
         freescale/imx8mq-evk-usdhc2-m2.dtb \
 "
 
+IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx"
+IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc"
+
+UBOOT_SUFFIX = "bin"
+
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd]       = "imx8mq_evk_config,sdcard"
 UBOOT_CONFIG[mfgtool]  = "imx8mq_evk_config"