3 files changed, 15 insertions, 18 deletions
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 7464cb08a..a6d5908bb 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/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index a2b959e3c..406ad7d78 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/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index 63047d021..a8acb43dc 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -23,12 +23,11 @@ KERNEL_DEVICETREE = " \
 "
 KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb"
-# 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 = ""
-UBOOT_MAKE_TARGET_pn-u-boot-fslc = ""
+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"
 UBOOT_CONFIG ??= " \
    sd \

diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf index 7464cb08a..a6d5908bb 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.


diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf index a2b959e3c..406ad7d78 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.


diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf index 63047d021..a8acb43dc 100644 --- a/conf/machine/imx6ulevk.conf +++ b/conf/machine/imx6ulevk.conf
@@ -23,12 +23,11 @@ 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	# These u-boot variables default to the correct settings for u-boot-imx.	26	# Use fslc u-boot by default. See also imx-base.inc.
27	# Set overrides for u-boot-fslc.	27	UBOOT_MAKE_TARGET = ""
28	UBOOT_MAKE_TARGET_pn-u-boot-fslc = ""	28	UBOOT_SUFFIX = "img"
29	UBOOT_SUFFIX_pn-u-boot-fslc = "img"	29	SPL_BINARY = "SPL"
30	SPL_BINARY_pn-u-boot-fslc = "SPL"	30	WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
31	WKS_FILE_pn-u-boot-fslc = "imx-uboot-spl-bootpart.wks.in"
32		31
33	UBOOT_CONFIG ??= " \	32	UBOOT_CONFIG ??= " \
34	sd \	33	sd \