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/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index e4f45d85..5ceb6b8b 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -55,6 +55,9 @@ UBOOT_MAKE_TARGET = \
 SPL_BINARY = \
     "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'spl/u-boot-spl.bin', \
                                                        '', d)}"
+IMX_DEFAULT_BOOTLOADER_use-nxp-bsp = "u-boot-imx"
+IMX_DEFAULT_BOOTLOADER_use-mainline-bsp = "u-boot-fslc"
+
 UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"