From f729e766544b1798be5827c5064f3d677542f54a Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 17 Jan 2014 10:51:04 +0100 Subject: [PATCH] meta-digi-arm: build JFFS2 images for ccardimx28 and kernel 3.10 Previously jffs2 images flashed from u-boot were not booting Linux. The kernel was unable to mount the rootfs. There have been some patches lately in the kernel that fix this problem, so build jffs2 images. Nevertheless the default image type is still ubifs when using linux 3.x. Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/imx-digi-base.inc | 3 --- meta-digi-arm/conf/machine/include/mxs-digi-base.inc | 8 +------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index acf4a160e..57dc667e3 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -36,9 +36,6 @@ PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51" EXTRA_IMAGEDEPENDS = "u-boot" # Flash image types -# Do not build ext3/sdcard until they are tested. -#SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" -#IMAGE_FSTYPES ?= "ext3 sdcard sum.jffs2 tar.bz2 ubifs" IMAGE_FSTYPES ?= "sum.jffs2 tar.bz2 ubifs" KERNEL_IMAGETYPE = "uImage" diff --git a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc index dfcc290ef..74be2ff8e 100644 --- a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc @@ -25,13 +25,7 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" EXTRA_IMAGEDEPENDS = "u-boot" # Flash image types -# [TODO] add SDCARD support -# At the moment it's failing due to wrong u-boot image -# SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" -# IMAGE_FSTYPES ?= "ext3 sdcard sum.jffs2 tar.bz2 ubifs" -# -# JFFS2 is not supported by kernel 3.10, so add it only for 2.6.35 -IMAGE_FSTYPES ?= "${@base_conditional('IS_KERNEL_2X', '1' , 'sum.jffs2', '', d)} tar.bz2 ubifs" +IMAGE_FSTYPES ?= "sum.jffs2 tar.bz2 ubifs" KERNEL_IMAGETYPE = "uImage"