Rework the u-boot-fslc and u-boot-imx settings logictopic/rework-bootloader

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, 8 insertions, 1 deletions

diff --git a/conf/machine/imx53ard.conf b/conf/machine/imx53ard.conf
index c6d7f0d9e..af5aeb3bc 100644
--- a/conf/machine/imx53ard.conf
+++ b/conf/machine/imx53ard.conf
@@ -13,9 +13,16 @@ include conf/machine/include/tune-cortexa8.inc
 PERF_FEATURES_ENABLE = ""
 
 KERNEL_DEVICETREE = "imx53-ard.dtb"
+KERNEL_IMAGETYPE = "uImage"
+
+# This machine is not supported by u-boot-imx as it is not tested by NXP on this
+# board. So we force it to use u-boot-fslc which is based on mainline here.
+IMX_DEFAULT_BOOTLOADER = "u-boot-fslc"
+
+UBOOT_MAKE_TARGET = "u-boot.imx"
+UBOOT_SUFFIX = "imx"
 
 UBOOT_MACHINE = "mx53ard_config"
-KERNEL_IMAGETYPE = "uImage"
 
 MACHINE_FIRMWARE += "linux-firmware-ar3k \
                      linux-firmware-ath6k"