From fa30892ada050029c199aa8ce355111c15462d0d Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 27 Apr 2015 17:14:16 +0200 Subject: [PATCH] meta-digi-arm: fix IMAGE_FSTYPES for MX5 platforms The IMAGE_FSTYPES variable for ccimx51js and ccimx53js was not correct, it was taking the default one from Poky (IMAGE_FSTYPES="tar.gz") instead of the one in 'imx-digi-base.inc' file. This happened because we were using the weak '??=' assignement while the default in Poky was using '?='. Also rework a bit how this variable is set, so it is easily overriden on project config files or initramfs recipes. Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/ccardimx28js.conf | 6 ++---- meta-digi-arm/conf/machine/ccimx51js.conf | 3 +++ meta-digi-arm/conf/machine/ccimx53js.conf | 3 +++ meta-digi-arm/conf/machine/ccimx6sbc.conf | 2 ++ meta-digi-arm/conf/machine/include/imx-digi-base.inc | 6 ------ meta-digi-arm/conf/machine/include/mxs-digi-base.inc | 3 --- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccardimx28js.conf b/meta-digi-arm/conf/machine/ccardimx28js.conf index a12c0b5c3..afa4ef870 100644 --- a/meta-digi-arm/conf/machine/ccardimx28js.conf +++ b/meta-digi-arm/conf/machine/ccardimx28js.conf @@ -22,11 +22,9 @@ CON_TTY ?= "${@base_conditional('IS_KERNEL_2X', '1' , 'ttyAM0', 'ttyAMA0', d)}" # U-Boot script to be copied to the SD image BOOT_SCRIPTS = "boot-sd.scr:boot.scr" -# Rootfs image for rootfs partition in sdcard image +# Flash image types SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4" - -# Build sdcard image for ccardimx28js -IMAGE_FSTYPES += "sdcard" +IMAGE_FSTYPES ?= "jffs2.sum sdcard tar.bz2 ubifs" # FLASH parameters MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 2047" diff --git a/meta-digi-arm/conf/machine/ccimx51js.conf b/meta-digi-arm/conf/machine/ccimx51js.conf index dd823fa28..962b10492 100644 --- a/meta-digi-arm/conf/machine/ccimx51js.conf +++ b/meta-digi-arm/conf/machine/ccimx51js.conf @@ -6,6 +6,9 @@ include conf/machine/include/ccimx51.inc SERIAL_CONSOLES = "38400;ttymxc1" +# Flash image types +IMAGE_FSTYPES ?= "jffs2.sum tar.bz2 ubifs" + # Per-variant FLASH parameters MKUBIFS_ARGS ?= "-m 2048 -e 129024 -c 4095" MKUBIFS_ARGS_agv4k ?= "-m 4096 -e 520192 -c 1023" diff --git a/meta-digi-arm/conf/machine/ccimx53js.conf b/meta-digi-arm/conf/machine/ccimx53js.conf index e5cd575b6..8c5382b39 100644 --- a/meta-digi-arm/conf/machine/ccimx53js.conf +++ b/meta-digi-arm/conf/machine/ccimx53js.conf @@ -7,6 +7,9 @@ include conf/machine/include/ccimx53.inc SERIAL_CONSOLES = "115200;ttymxc0" +# Flash image types +IMAGE_FSTYPES ?= "jffs2.sum tar.bz2 ubifs" + # Per-variant FLASH parameters MKUBIFS_ARGS ?= "-m 2048 -e 129024 -c 4095" MKUBIFS_ARGS_4k ?= "-m 4096 -e 520192 -c 1023" diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index c981343d2..fe4069461 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -18,4 +18,6 @@ BOOT_SCRIPTS = "boot-sd.scr:boot.scr" # Boot partition size for FAT image generation, 64MiB BOARD_BOOTIMAGE_PARTITION_SIZE ?= "67108864" +# Flash image types +SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4" IMAGE_FSTYPES ?= "boot.vfat ext4 sdcard tar.bz2" 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 67a08eff2..3a9b8e134 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -62,12 +62,6 @@ PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-viv" EXTRA_IMAGEDEPENDS = "u-boot" -# Flash image types -IMAGE_FSTYPES ??= "jffs2.sum tar.bz2 ubifs" - -# MX6 does not have flash memory so build sdcard images -SDCARD_ROOTFS_mx6 ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4" - KERNEL_IMAGETYPE = "uImage" MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen" 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 d35422a6d..10ba4676b 100644 --- a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc @@ -27,9 +27,6 @@ MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf" EXTRA_IMAGEDEPENDS = "u-boot" -# Flash image types -IMAGE_FSTYPES ?= "jffs2.sum tar.bz2 ubifs" - KERNEL_IMAGETYPE = "uImage" MACHINE_FEATURES = "apm usbgadget usbhost vfat"