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

diff --git a/conf/machine/imx51evk.conf b/conf/machine/imx51evk.conf
index 5741f2e2..80d7b386 100644
--- a/conf/machine/imx51evk.conf
+++ b/conf/machine/imx51evk.conf
@@ -11,4 +11,11 @@ include conf/machine/include/tune-cortexa8.inc
 
 KERNEL_DEVICETREE = "imx51-babbage.dtb"
 
+# 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 = "mx51evk_config"