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