summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/machine/imx6qdlsabreauto.conf11
-rw-r--r--conf/machine/imx6qdlsabresd.conf11
-rw-r--r--conf/machine/imx6ulevk.conf11
3 files changed, 15 insertions, 18 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 = " \
34 34
35UBOOT_MACHINE ?= "mx6sabreauto_defconfig" 35UBOOT_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. 38UBOOT_MAKE_TARGET = "all"
39UBOOT_MAKE_TARGET_pn-u-boot-fslc = "all" 39UBOOT_SUFFIX = "img"
40UBOOT_SUFFIX_pn-u-boot-fslc = "img" 40SPL_BINARY = "SPL"
41SPL_BINARY_pn-u-boot-fslc = "SPL" 41WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
42WKS_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 a2b959e3..406ad7d7 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -43,12 +43,11 @@ KERNEL_DEVICETREE_use-mainline-bsp = " \
43 43
44UBOOT_MACHINE ?= "mx6sabresd_defconfig" 44UBOOT_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. 47UBOOT_MAKE_TARGET = "all"
48UBOOT_MAKE_TARGET_pn-u-boot-fslc = "all" 48UBOOT_SUFFIX = "img"
49UBOOT_SUFFIX_pn-u-boot-fslc = "img" 49SPL_BINARY = "SPL"
50SPL_BINARY_pn-u-boot-fslc = "SPL" 50WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
51WKS_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 63047d02..a8acb43d 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -23,12 +23,11 @@ KERNEL_DEVICETREE = " \
23" 23"
24KERNEL_DEVICETREE_use-mainline-bsp = "imx6ul-14x14-evk.dtb" 24KERNEL_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. 27UBOOT_MAKE_TARGET = ""
28UBOOT_MAKE_TARGET_pn-u-boot-fslc = "" 28UBOOT_SUFFIX = "img"
29UBOOT_SUFFIX_pn-u-boot-fslc = "img" 29SPL_BINARY = "SPL"
30SPL_BINARY_pn-u-boot-fslc = "SPL" 30WKS_FILE = "imx-uboot-spl-bootpart.wks.in"
31WKS_FILE_pn-u-boot-fslc = "imx-uboot-spl-bootpart.wks.in"
32 31
33UBOOT_CONFIG ??= " \ 32UBOOT_CONFIG ??= " \
34 sd \ 33 sd \