Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2015-04-27 17:14:16 +02:00
parent 6dd31598d0
commit fa30892ada
6 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta-digi-arm/conf/machine/ccardimx28js.conf
View File

@ -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 # U-Boot script to be copied to the SD image
BOOT_SCRIPTS = "boot-sd.scr:boot.scr" 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" SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext4"
IMAGE_FSTYPES ?= "jffs2.sum sdcard tar.bz2 ubifs"
# Build sdcard image for ccardimx28js
IMAGE_FSTYPES += "sdcard"
# FLASH parameters # FLASH parameters
MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 2047" MKUBIFS_ARGS ?= "-m 2048 -e 126976 -c 2047"

3
meta-digi-arm/conf/machine/ccimx51js.conf
View File

@ -6,6 +6,9 @@ include conf/machine/include/ccimx51.inc
SERIAL_CONSOLES = "38400;ttymxc1" SERIAL_CONSOLES = "38400;ttymxc1"
# Flash image types
IMAGE_FSTYPES ?= "jffs2.sum tar.bz2 ubifs"
# Per-variant FLASH parameters # Per-variant FLASH parameters
MKUBIFS_ARGS ?= "-m 2048 -e 129024 -c 4095" MKUBIFS_ARGS ?= "-m 2048 -e 129024 -c 4095"
MKUBIFS_ARGS_agv4k ?= "-m 4096 -e 520192 -c 1023" MKUBIFS_ARGS_agv4k ?= "-m 4096 -e 520192 -c 1023"

3
meta-digi-arm/conf/machine/ccimx53js.conf
View File

@ -7,6 +7,9 @@ include conf/machine/include/ccimx53.inc
SERIAL_CONSOLES = "115200;ttymxc0" SERIAL_CONSOLES = "115200;ttymxc0"
# Flash image types
IMAGE_FSTYPES ?= "jffs2.sum tar.bz2 ubifs"
# Per-variant FLASH parameters # Per-variant FLASH parameters
MKUBIFS_ARGS ?= "-m 2048 -e 129024 -c 4095" MKUBIFS_ARGS ?= "-m 2048 -e 129024 -c 4095"
MKUBIFS_ARGS_4k ?= "-m 4096 -e 520192 -c 1023" MKUBIFS_ARGS_4k ?= "-m 4096 -e 520192 -c 1023"

2
meta-digi-arm/conf/machine/ccimx6sbc.conf
View File

@ -18,4 +18,6 @@ BOOT_SCRIPTS = "boot-sd.scr:boot.scr"
# Boot partition size for FAT image generation, 64MiB # Boot partition size for FAT image generation, 64MiB
BOARD_BOOTIMAGE_PARTITION_SIZE ?= "67108864" 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" IMAGE_FSTYPES ?= "boot.vfat ext4 sdcard tar.bz2"

6
meta-digi-arm/conf/machine/include/imx-digi-base.inc
View File

@ -62,12 +62,6 @@ PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-viv"
EXTRA_IMAGEDEPENDS = "u-boot" 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" KERNEL_IMAGETYPE = "uImage"
MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen" MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"

3
meta-digi-arm/conf/machine/include/mxs-digi-base.inc
View File

@ -27,9 +27,6 @@ MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf"
EXTRA_IMAGEDEPENDS = "u-boot" EXTRA_IMAGEDEPENDS = "u-boot"
# Flash image types
IMAGE_FSTYPES ?= "jffs2.sum tar.bz2 ubifs"
KERNEL_IMAGETYPE = "uImage" KERNEL_IMAGETYPE = "uImage"
MACHINE_FEATURES = "apm usbgadget usbhost vfat" MACHINE_FEATURES = "apm usbgadget usbhost vfat"