summaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-09-21 16:59:49 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2016-04-19 15:03:20 -0300
commite857011a4f874c62861f9ae6d7afcb4df0cf7baa (patch)
tree92fcf12a062e1a05fe54ad129c8a3cb8f7615e8b /conf/machine
parente88dee3b0d5ac49d2ebaa8014b79a46044482776 (diff)
downloadmeta-freescale-e857011a4f874c62861f9ae6d7afcb4df0cf7baa.tar.gz
mxs-base.inc: Consolidate IMAGE_FSTYPES definition
The default value for IMAGE_FSTYPES including SDCard class enable all machine to work out of the box using the .sdcard image. The removed duplication affected the following machines: - imx23evk - imx28evk Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/imx23evk.conf3
-rw-r--r--conf/machine/imx28evk.conf3
-rw-r--r--conf/machine/include/mxs-base.inc3
3 files changed, 3 insertions, 6 deletions
diff --git a/conf/machine/imx23evk.conf b/conf/machine/imx23evk.conf
index ecaef9a6..1d5eaefb 100644
--- a/conf/machine/imx23evk.conf
+++ b/conf/machine/imx23evk.conf
@@ -13,7 +13,4 @@ UBOOT_MACHINE = "mx23evk_config"
13 13
14KERNEL_DEVICETREE = "imx23-evk.dtb" 14KERNEL_DEVICETREE = "imx23-evk.dtb"
15 15
16SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
17IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"
18
19MACHINE_FEATURES = "apm usbgadget usbhost vfat touchscreen" 16MACHINE_FEATURES = "apm usbgadget usbhost vfat touchscreen"
diff --git a/conf/machine/imx28evk.conf b/conf/machine/imx28evk.conf
index 86123c31..5a55d725 100644
--- a/conf/machine/imx28evk.conf
+++ b/conf/machine/imx28evk.conf
@@ -17,9 +17,6 @@ UBOOT_CONFIG[sd-auart-console] = "mx28evk_auart_console_config,sdcard"
17 17
18KERNEL_DEVICETREE = "imx28-evk.dtb" 18KERNEL_DEVICETREE = "imx28-evk.dtb"
19 19
20SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
21IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"
22
23SERIAL_CONSOLE = "115200 ttyAMA0" 20SERIAL_CONSOLE = "115200 ttyAMA0"
24 21
25MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen" 22MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
index d576dd39..b32e926b 100644
--- a/conf/machine/include/mxs-base.inc
+++ b/conf/machine/include/mxs-base.inc
@@ -35,5 +35,8 @@ SERIAL_CONSOLE = "115200 ttyAMA0"
35 35
36KERNEL_IMAGETYPE = "zImage" 36KERNEL_IMAGETYPE = "zImage"
37 37
38SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
39IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard"
40
38# Add the ability to specify _imx machines 41# Add the ability to specify _imx machines
39MACHINEOVERRIDES =. "imx:" 42MACHINEOVERRIDES =. "imx:"