1 files changed, 5 insertions, 6 deletions
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index a2b959e3..406ad7d7 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -43,12 +43,11 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
 UBOOT_MACHINE ?= "mx6sabresd_defconfig"
-# These u-boot variables default to the correct settings for u-boot-imx.
+# Use fslc u-boot by default. See also imx-base.inc.
-# Set overrides for u-boot-fslc.
+UBOOT_MAKE_TARGET = "all"
-UBOOT_MAKE_TARGET_pn-u-boot-fslc = "all"
+UBOOT_SUFFIX = "img"
-UBOOT_SUFFIX_pn-u-boot-fslc = "img"
+SPL_BINARY = "SPL"
-SPL_BINARY_pn-u-boot-fslc = "SPL"
+WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
-WKS_FILE_pn-u-boot-fslc = "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.

diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index a2b959e3..406ad7d7 100644 --- a/conf/machine/imx6qdlsabresd.conf +++ b/conf/machine/imx6qdlsabresd.conf
@@ -43,12 +43,11 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
43		43
44	UBOOT_MACHINE ?= "mx6sabresd_defconfig"	44	UBOOT_MACHINE ?= "mx6sabresd_defconfig"
45		45
46	# These u-boot variables default to the correct settings for u-boot-imx.	46	# Use fslc u-boot by default. See also imx-base.inc.
47	# Set overrides for u-boot-fslc.	47	UBOOT_MAKE_TARGET = "all"
48	UBOOT_MAKE_TARGET_pn-u-boot-fslc = "all"	48	UBOOT_SUFFIX = "img"
49	UBOOT_SUFFIX_pn-u-boot-fslc = "img"	49	SPL_BINARY = "SPL"
50	SPL_BINARY_pn-u-boot-fslc = "SPL"	50	WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
51	WKS_FILE_pn-u-boot-fslc = "imx-uboot-spl-bootpart.wks.in"
52		51
53	# The fsl distro uses u-boot-imx which does not provide unified functionality	52	# The fsl distro uses u-boot-imx which does not provide unified functionality
54	# for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant.	53	# for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant.