3 files changed, 18 insertions, 15 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/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 406ad7d7..a2b959e3 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -43,11 +43,12 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
 UBOOT_MACHINE ?= "mx6sabresd_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/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index a8acb43d..63047d02 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -23,11 +23,12 @@ KERNEL_DEVICETREE = " \
 "
 KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb"
-# 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 = ""
+# Set overrides for u-boot-fslc.
-UBOOT_SUFFIX = "img"
+UBOOT_MAKE_TARGET_pn-u-boot-fslc = ""
-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"
 UBOOT_CONFIG ??= " \
    sd \

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.


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


diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index a8acb43d..63047d02 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf
@@ -23,11 +23,12 @@ KERNEL_DEVICETREE = " \
23	"	23	"
24	KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb"	24	KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb"
25		25
26	# Use fslc u-boot by default. See also imx-base.inc.	26	# These u-boot variables default to the correct settings for u-boot-imx.
27	UBOOT_MAKE_TARGET = ""	27	# Set overrides for u-boot-fslc.
28	UBOOT_SUFFIX = "img"	28	UBOOT_MAKE_TARGET_pn-u-boot-fslc = ""
29	SPL_BINARY = "SPL"	29	UBOOT_SUFFIX_pn-u-boot-fslc = "img"
30	WKS_FILE = "imx-uboot-spl-bootpart.wks.in"	30	SPL_BINARY_pn-u-boot-fslc = "SPL"
		31	WKS_FILE_pn-u-boot-fslc = "imx-uboot-spl-bootpart.wks.in"
31		32
32	UBOOT_CONFIG ??= " \	33	UBOOT_CONFIG ??= " \
33	sd \	34	sd \