summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/imx25pdk.conf2
-rw-r--r--conf/machine/imx6qdlsabreauto.conf1
-rw-r--r--conf/machine/imx6qdlsabresd.conf1
-rw-r--r--conf/machine/imx6ulevk.conf1
-rw-r--r--conf/machine/include/imx-base.inc7
5 files changed, 7 insertions, 5 deletions
diff --git a/conf/machine/imx25pdk.conf b/conf/machine/imx25pdk.conf
index f35d0db4..e22d9f4e 100644
--- a/conf/machine/imx25pdk.conf
+++ b/conf/machine/imx25pdk.conf
@@ -17,7 +17,7 @@ SERIAL_CONSOLE = "115200 ttymxc0"
17 17
18MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen" 18MACHINE_FEATURES = "usbgadget usbhost vfat alsa touchscreen"
19 19
20WKS_FILE ?= "imx-uboot.wks" 20WKS_FILE = "imx-uboot.wks"
21MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \ 21MACHINE_ESSENTIAL_EXTRA_RDEPENDS += " \
22 kernel-image \ 22 kernel-image \
23 kernel-devicetree \ 23 kernel-devicetree \
diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 8967c150..0eed1e5c 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -31,6 +31,7 @@ UBOOT_MACHINE ?= "mx6sabreauto_defconfig"
31UBOOT_MAKE_TARGET = "all" 31UBOOT_MAKE_TARGET = "all"
32UBOOT_SUFFIX = "img" 32UBOOT_SUFFIX = "img"
33SPL_BINARY = "SPL" 33SPL_BINARY = "SPL"
34WKS_FILE = "imx-uboot-spl-bootpart.wks"
34 35
35SERIAL_CONSOLE = "115200 ttymxc3" 36SERIAL_CONSOLE = "115200 ttymxc3"
36 37
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 92c92884..91ca9b45 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -31,6 +31,7 @@ UBOOT_MACHINE ?= "mx6sabresd_defconfig"
31UBOOT_MAKE_TARGET = "all" 31UBOOT_MAKE_TARGET = "all"
32UBOOT_SUFFIX = "img" 32UBOOT_SUFFIX = "img"
33SPL_BINARY = "SPL" 33SPL_BINARY = "SPL"
34WKS_FILE = "imx-uboot-spl-bootpart.wks"
34 35
35SERIAL_CONSOLE = "115200 ttymxc0" 36SERIAL_CONSOLE = "115200 ttymxc0"
36 37
diff --git a/conf/machine/imx6ulevk.conf b/conf/machine/imx6ulevk.conf
index dadd525b..1b55a4ad 100644
--- a/conf/machine/imx6ulevk.conf
+++ b/conf/machine/imx6ulevk.conf
@@ -23,3 +23,4 @@ UBOOT_CONFIG[sd] = "mx6ul_14x14_evk_config,sdcard"
23UBOOT_CONFIG[emmc] = "mx6ul_14x14_evk_emmc_config,sdcard" 23UBOOT_CONFIG[emmc] = "mx6ul_14x14_evk_emmc_config,sdcard"
24UBOOT_CONFIG[qspi1] = "mx6ul_14x14_evk_qspi1_config" 24UBOOT_CONFIG[qspi1] = "mx6ul_14x14_evk_qspi1_config"
25UBOOT_CONFIG[mfgtool] = "mx6ul_14x14_evk_config" 25UBOOT_CONFIG[mfgtool] = "mx6ul_14x14_evk_config"
26WKS_FILE = "imx-uboot-spl-bootpart.wks"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index e1b7895d..4c7071b6 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -222,8 +222,8 @@ IMX_DEFAULT_KERNEL_use-mainline-bsp = "linux-fslc"
222 222
223PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}" 223PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
224 224
225SOC_DEFAULT_IMAGE_FSTYPES = "sdcard.gz" 225SOC_DEFAULT_IMAGE_FSTYPES = "wic.gz"
226SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot-mxsboot-sdcard sdcard.gz" 226SOC_DEFAULT_IMAGE_FSTYPES_mxs = "uboot-mxsboot-sdcard wic.gz"
227 227
228SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4" 228SDCARD_ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_NAME}.rootfs.ext4"
229IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}" 229IMAGE_FSTYPES ?= "${SOC_DEFAULT_IMAGE_FSTYPES}"
@@ -240,8 +240,7 @@ WKS_FILE_DEPENDS ?= " \
240 e2fsprogs-native \ 240 e2fsprogs-native \
241 bmap-tools-native \ 241 bmap-tools-native \
242" 242"
243 243WKS_FILE ?= "imx-uboot-bootpart.wks"
244SOC_DEFAULT_IMAGE_FSTYPES_mx25 = "wic.gz"
245 244
246SERIAL_CONSOLE = "115200 ttymxc0" 245SERIAL_CONSOLE = "115200 ttymxc0"
247SERIAL_CONSOLE_mxs = "115200 ttyAMA0" 246SERIAL_CONSOLE_mxs = "115200 ttyAMA0"