From e857011a4f874c62861f9ae6d7afcb4df0cf7baa Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 21 Sep 2015 16:59:49 -0300 Subject: 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 --- conf/machine/imx23evk.conf | 3 --- conf/machine/imx28evk.conf | 3 --- conf/machine/include/mxs-base.inc | 3 +++ 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'conf') 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" KERNEL_DEVICETREE = "imx23-evk.dtb" -SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" -IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard" - MACHINE_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" KERNEL_DEVICETREE = "imx28-evk.dtb" -SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" -IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard" - SERIAL_CONSOLE = "115200 ttyAMA0" MACHINE_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" KERNEL_IMAGETYPE = "zImage" +SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" +IMAGE_FSTYPES ?= "tar.bz2 ext3 uboot.mxsboot-sdcard sdcard" + # Add the ability to specify _imx machines MACHINEOVERRIDES =. "imx:" -- cgit v1.2.3-54-g00ecf