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/imx8dxl-evk.conf b/conf/machine/imx8dxl-evk.conf
index 84ab5315..5d177aa3 100644
--- a/conf/machine/imx8dxl-evk.conf
+++ b/conf/machine/imx8dxl-evk.conf
@@ -37,8 +37,13 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
 ATF_PLATFORM = "imx8dxl"
 IMX_BOOT_SOC_TARGET = "iMX8DXL"
 
+# This machine is not supported by u-boot-fslc, so we force it to use
+# u-boot-imx here.
+IMX_DEFAULT_BOOTLOADER = "u-boot-imx"
+
 UBOOT_MAKE_TARGET = "all"
 SPL_BINARY = "spl/u-boot-spl.bin"
+UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd]   = "imx8dxl_evk_defconfig,sdcard"