u-boot.imx: Add u-boot configuration for fsl

The fsl distro was broken for the following machine files
because they set u-boot configuration to fslc configuration:

- imx6qdlsabreauto
- imx6qdlsabresd
- imx6ulevk

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit e5cd33c9b393ce3f434c8cf0d0bfa65357a1a249)

diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index fabd4cd0d61d48efad1d6da899ddf75a8302bba0..71b1cf88074ccfd5791e85de6cc809f47eba2aa4 100644 (file)
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -33,6 +33,8 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
 "
 
 UBOOT_MACHINE ?= "mx6sabreauto_defconfig"
+
+# Use fslc u-boot by default. See also imx-base.inc.
 UBOOT_MAKE_TARGET = "all"
 UBOOT_SUFFIX = "img"
 SPL_BINARY = "SPL"

diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 7cde50592213fc5a2715124338f9a2b3e95b8bc1..a8407e2813f4abb23e831807711524a458b7d883 100644 (file)
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -33,6 +33,8 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
 "
 
 UBOOT_MACHINE ?= "mx6sabresd_defconfig"
+
+# Use fslc u-boot by default. See also imx-base.inc.
 UBOOT_MAKE_TARGET = "all"
 UBOOT_SUFFIX = "img"
 SPL_BINARY = "SPL"

diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 14f83828a261db32ba0c0a54a5f230bd93cdccd9..01ebce6f687d148621b54cfabba594eb9ebaa6c2 100644 (file)
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -16,12 +16,14 @@ KERNEL_DEVICETREE = "imx6ul-14x14-evk.dtb imx6ul-14x14-evk-csi.dtb imx6ul-14x14-
                      imx6ul-14x14-evk-emmc.dtb "
 KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb"
 
+# Use fslc u-boot by default. See also imx-base.inc.
+UBOOT_MAKE_TARGET = ""
 UBOOT_SUFFIX = "img"
 SPL_BINARY = "SPL"
-UBOOT_MAKE_TARGET = ""
+WKS_FILE = "imx-uboot-spl-bootpart.wks"
+
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd] = "mx6ul_14x14_evk_config,sdcard"
 UBOOT_CONFIG[emmc] = "mx6ul_14x14_evk_emmc_config,sdcard"
 UBOOT_CONFIG[qspi1] = "mx6ul_14x14_evk_qspi1_config"
 UBOOT_CONFIG[mfgtool] = "mx6ul_14x14_evk_config"
-WKS_FILE = "imx-uboot-spl-bootpart.wks"

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 6366ae82f55a174cbf8166dcf6f4ff243514fd82..012af537b151a89fb8b43f3536a187e287b44c05 100644 (file)
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -310,6 +310,14 @@ SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in"
 
 WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
 
+# Certain machines override the default fsl u-boot with the
+# fslc u-boot. To restore the fsl u-boot, add use-fsl-bsp like this:
+#   MACHINEOVERRIDES_prepend_imx6ulevk = "use-fsl-bsp:"
+UBOOT_MAKE_TARGET_use-fsl-bsp = "u-boot.imx"
+UBOOT_SUFFIX_use-fsl-bsp = "imx"
+SPL_BINARY_use-fsl-bsp = ""
+WKS_FILE_use-fsl-bsp = "imx-uboot-bootpart.wks"
+
 SERIAL_CONSOLE = "115200 ttymxc0"
 SERIAL_CONSOLE_mxs = "115200 ttyAMA0"