machines: imx-base.inc: fix failing u-boot builds

If using a fsl-xxx distro the prefered provider of U-Boot is
u-boot-imx. That U-Boot didn't make the switch to a unified dl/q/qp
binary and does not use an spl. For the imx6ulevk it does not use an
spl.

The below commits try to address that, however the change is not
limited to
- the fsl distro but rather uses use-nxp-bsp which can be used with any distro
- some machines which do not use u-boot-imx, e.g. colibri-imx6 now fail.

Fix this by moving the configuration into the affected distro in
meta-freescale-distro and the machines.

Fixes:
c9757ea3 ("imx-base.inc: Fix use-nxp-bsp after rework")
77e56f30 ("imx-base.inc: Limit use-fsl-bsp u-boot overrides to i.MX 6 and 7")
e5cd33c9 ("u-boot.imx: Add u-boot configuration for fsl")

Build tested with fsl-xwayland & use-nxp-bsp for imx6qdlsabreauto,
imx6qdlsabresd, and imx6ulevk.
Build tested with the fslc-xwayland & use-nxp-bsp for imx6qdlsabreauto,
imx6qdlsabresd, imx6ulevk, and colibri-imx6.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit b6e910abdea72f9cd6336c4eeecdf8646e3543c2)

3 files changed, 8 insertions, 12 deletions

diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 16c1dcb6..a6d5908b 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -40,6 +40,10 @@ UBOOT_SUFFIX = "img"
 SPL_BINARY = "SPL"
 WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
 
+# The fsl distro uses u-boot-imx which does not provide unified functionality
+# for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant.
+UBOOT_MACHINE_fsl = "mx6qsabreauto_defconfig"
+
 SERIAL_CONSOLES = "115200;ttymxc3"
 
 MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 2fe95dc6..406ad7d7 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -49,6 +49,10 @@ UBOOT_SUFFIX = "img"
 SPL_BINARY = "SPL"
 WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
 
+# The fsl distro uses u-boot-imx which does not provide unified functionality
+# for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant.
+UBOOT_MACHINE_fsl = "mx6qsabresd_defconfig"
+
 SERIAL_CONSOLES = "115200;ttymxc0"
 
 MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 1fccf1d8..16f2f509 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -372,18 +372,6 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in"
 
 WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
 
-# Certain machines are set to use the mainline u-boot by default
-# to encourage syncronization with mainline. Undo that here for
-# machines that don't work with mainline.
-UBOOT_MAKE_TARGET_use-nxp-bsp_mx6 = "u-boot.imx"
-UBOOT_SUFFIX_use-nxp-bsp_mx6 = "imx"
-SPL_BINARY_use-nxp-bsp_mx6 = ""
-WKS_FILE_use-nxp-bsp_mx6 = "imx-uboot-bootpart.wks.in"
-UBOOT_MAKE_TARGET_use-nxp-bsp_mx7 = "u-boot.imx"
-UBOOT_SUFFIX_use-nxp-bsp_mx7 = "imx"
-SPL_BINARY_use-nxp-bsp_mx7 = ""
-WKS_FILE_use-nxp-bsp_mx7 = "imx-uboot-bootpart.wks.in"
-
 SERIAL_CONSOLES = "115200;ttymxc0"
 SERIAL_CONSOLES_mxs = "115200;ttyAMA0"