1 files changed, 5 insertions, 6 deletions
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 7464cb08..a6d5908b 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -34,12 +34,11 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
 UBOOT_MACHINE ?= "mx6sabreauto_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/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index 7464cb08..a6d5908b 100644 --- a/conf/machine/imx6qdlsabreauto.conf +++ b/conf/machine/imx6qdlsabreauto.conf
@@ -34,12 +34,11 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
34		34
35	UBOOT_MACHINE ?= "mx6sabreauto_defconfig"	35	UBOOT_MACHINE ?= "mx6sabreauto_defconfig"
36		36
37	# These u-boot variables default to the correct settings for u-boot-imx.	37	# Use fslc u-boot by default. See also imx-base.inc.
38	# Set overrides for u-boot-fslc.	38	UBOOT_MAKE_TARGET = "all"
39	UBOOT_MAKE_TARGET_pn-u-boot-fslc = "all"	39	UBOOT_SUFFIX = "img"
40	UBOOT_SUFFIX_pn-u-boot-fslc = "img"	40	SPL_BINARY = "SPL"
41	SPL_BINARY_pn-u-boot-fslc = "SPL"	41	WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
42	WKS_FILE_pn-u-boot-fslc = "imx-uboot-spl-bootpart.wks.in"
43		42
44	# The fsl distro uses u-boot-imx which does not provide unified functionality	43	# The fsl distro uses u-boot-imx which does not provide unified functionality
45	# for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant.	44	# for dl/q/qp SoC variants. Change the defconfig to the targeted SoC variant.