diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf index f843091da..73be213f8 100644 --- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf @@ -47,11 +47,6 @@ BT_TTY ?= "ttymxc1" # XBee XBEE_TTY ?= "ttymxc4" -# Image FS types -IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ - "boot.vfat tar.xz recovery.vfat squashfs", \ - "boot.vfat ext4.gz tar.xz recovery.vfat", d)}' - # Boot artifacts to be copied from the deploy dir to the installer ZIP BOOTABLE_ARTIFACTS = " \ u-boot-ccimx6qpsbc1GB.imx \ diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index 0eca09ba6..232a9c350 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -49,11 +49,6 @@ BT_TTY ?= "ttymxc1" # XBee XBEE_TTY ?= "ttymxc4" -# Image FS types -IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ - "boot.vfat tar.xz recovery.vfat squashfs", \ - "boot.vfat ext4.gz tar.xz recovery.vfat", d)}' - # Boot artifacts to be copied from the deploy dir to the installer ZIP BOOTABLE_ARTIFACTS = " \ u-boot-ccimx6dlsbc512MB.imx \ diff --git a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf index f9667d9fb..5daf216bf 100644 --- a/meta-digi-arm/conf/machine/ccimx6ulsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6ulsbc.conf @@ -34,11 +34,6 @@ BT_TTY ?= "ttymxc0" # XBee XBEE_TTY ?= "ttymxc1" -# Image FS types -IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ - "tar.xz boot.ubifs recovery.ubifs squashfs", \ - "tar.xz ubifs boot.ubifs recovery.ubifs", d)}' - # Boot artifacts to be copied from the deploy dir to the installer ZIP BOOTABLE_ARTIFACTS = " \ u-boot-ccimx6ulsbc1GB.imx \ diff --git a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf index 2d653a4a6..6771aafdd 100644 --- a/meta-digi-arm/conf/machine/ccimx6ulstarter.conf +++ b/meta-digi-arm/conf/machine/ccimx6ulstarter.conf @@ -30,11 +30,6 @@ SERIAL_CONSOLES ?= "115200;ttymxc4" # Bluetooth tty BT_TTY ?= "ttymxc0" -# Image FS types -IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ - "tar.xz boot.ubifs recovery.ubifs squashfs", \ - "tar.xz ubifs boot.ubifs recovery.ubifs", d)}' - # Default image for install scripts DEFAULT_IMAGE_NAME ?= "core-image-base" diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf index 1de9b6bce..4f296ec50 100644 --- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf @@ -54,11 +54,6 @@ XBEE_RESET_N_GPIO ?= "mca-gpio@15,gpio1@8" XBEE_SLEEP_RQ_GPIO ?= "mca-gpio@11,gpio1@7" XBEE_TTY ?= "ttymxc3" -# Image FS types -IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ - "boot.vfat tar.xz recovery.vfat squashfs", \ - "boot.vfat ext4.gz tar.xz recovery.vfat", d)}' - # Boot artifacts to be copied from the deploy dir to the installer ZIP BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mm-dvk.bin" diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf index 7b2a6788e..3270b8096 100644 --- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf @@ -55,11 +55,6 @@ XBEE_RESET_N_GPIO ?= "mca-gpio@15,gpio1@8" XBEE_SLEEP_RQ_GPIO ?= "mca-gpio@11,gpio1@7" XBEE_TTY ?= "ttymxc3" -# Image FS types -IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ - "boot.vfat tar.xz recovery.vfat squashfs", \ - "boot.vfat ext4.gz tar.xz recovery.vfat", d)}' - # Boot artifacts to be copied from the deploy dir to the installer ZIP BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mn-dvk.bin" diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf index 9040b7bdb..ffd76bad3 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf @@ -32,11 +32,6 @@ XBEE_RESET_N_GPIO ?= "gpio3@13" XBEE_SLEEP_RQ_GPIO ?= "gpio3@16" XBEE_TTY ?= "ttyLP0" -# Image FS types -IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ - "boot.vfat tar.xz recovery.vfat squashfs", \ - "boot.vfat ext4.gz tar.xz recovery.vfat", d)}' - # Boot artifacts to be copied from the deploy dir to the installer ZIP BOOTABLE_ARTIFACTS = " \ imx-boot-ccimx8x-sbc-express-B0.bin \ diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index c7b38fc5a..fd55f8cb2 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -47,11 +47,6 @@ XBEE_RESET_N_GPIO ?= "mca-gpio@15" XBEE_SLEEP_RQ_GPIO ?= "mca-gpio@11" XBEE_TTY ?= "ttyMCA0" -# Image FS types -IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ - "boot.vfat tar.xz recovery.vfat squashfs", \ - "boot.vfat ext4.gz tar.xz recovery.vfat", d)}' - # Boot artifacts to be copied from the deploy dir to the installer ZIP BOOTABLE_ARTIFACTS = " \ imx-boot-ccimx8x-sbc-pro-B0.bin \ diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index 0fad3d8de..61668bbd6 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -84,16 +84,6 @@ MACHINE_EXTRA_RRECOMMENDS += " \ ${MACHINE_FIRMWARE} \ " -# ========================================================================= -# Image -# ========================================================================= -# Image FS types -# tar.xz is omitted here because it's already being added via -# st-machine-common-stm32mp.inc in the meta-st-stm32mp layer -IMAGE_FSTYPES += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ - "boot.ubifs recovery.ubifs squashfs", \ - "ubifs boot.ubifs recovery.ubifs", d)}' - # Default image for install scripts DEFAULT_IMAGE_NAME ?= "core-image-base" diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 1f30afb6a..18b567fca 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -97,16 +97,6 @@ MACHINE_EXTRA_RRECOMMENDS += " \ ${MACHINE_FIRMWARE} \ " -# ========================================================================= -# Image -# ========================================================================= -# Image FS types -# tar.xz is omitted here because it's already being added via -# st-machine-common-stm32mp.inc in the meta-st-stm32mp layer -IMAGE_FSTYPES += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ - "boot.ubifs recovery.ubifs squashfs", \ - "ubifs boot.ubifs recovery.ubifs", d)}' - # Default image for install scripts DEFAULT_IMAGE_NAME ?= "dey-image-webkit" diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf index 124ec0a90..d7ab816b4 100644 --- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf @@ -109,16 +109,6 @@ MACHINE_EXTRA_RRECOMMENDS += " \ ${MACHINE_FIRMWARE} \ " -# ========================================================================= -# Image -# ========================================================================= -# Image FS types -# tar.xz is omitted here because it's already being added via -# st-machine-common-stm32mp.inc in the meta-st-stm32mp layer -IMAGE_FSTYPES += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ - "boot.vfat recovery.vfat squashfs", \ - "boot.vfat recovery.vfat ext4.gz", d)}' - # Default image for install scripts DEFAULT_IMAGE_NAME ?= "dey-image-webkit" diff --git a/meta-digi-arm/conf/machine/include/ccimx9.inc b/meta-digi-arm/conf/machine/include/ccimx9.inc index b2ed62b54..9fba16f9b 100644 --- a/meta-digi-arm/conf/machine/include/ccimx9.inc +++ b/meta-digi-arm/conf/machine/include/ccimx9.inc @@ -97,11 +97,6 @@ XBEE_RESET_N_GPIO ?= "gpio2@19" XBEE_SLEEP_RQ_GPIO ?= "" XBEE_TTY ?= "ttyLP3" -# Image FS types -IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ - "boot.vfat recovery.vfat squashfs tar.xz", \ - "boot.vfat recovery.vfat ext4.gz tar.xz", d)}' - # Default overlayfs_etc mount point and type OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data" OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p7" diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc index 9260f2a37..f2d8f7166 100644 --- a/meta-digi-arm/conf/machine/include/ccmp1.inc +++ b/meta-digi-arm/conf/machine/include/ccmp1.inc @@ -77,7 +77,11 @@ MACHINE_EXTRA_RRECOMMENDS:remove = "kernel-imagebootfs" # ========================================================================= ALSA_LIST:stm32mp1common = "" -# Image FS types +# Image FS types (set by meta-st-stm32mp layer) +# tar.xz is omitted here because it's already added by ST layer +IMAGE_FSTYPES += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ + "boot.ubifs recovery.ubifs squashfs", \ + "boot.ubifs recovery.ubifs ubifs", d)}' IMAGE_FSTYPES:remove = "ext4" IMAGE_FSTYPES:append = " ${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard', 'boot.vfat ext4.gz', '', d)}" diff --git a/meta-digi-arm/conf/machine/include/ccmp2.inc b/meta-digi-arm/conf/machine/include/ccmp2.inc index 6929110f5..c8452ddbf 100644 --- a/meta-digi-arm/conf/machine/include/ccmp2.inc +++ b/meta-digi-arm/conf/machine/include/ccmp2.inc @@ -90,7 +90,11 @@ MACHINE_EXTRA_RDEPENDS += " \ # ========================================================================= ALSA_LIST:stm32mp2common = "" -# Image FS types +# Image FS types (set by meta-st-stm32mp layer) +# tar.xz is omitted here because it's already added by ST layer +IMAGE_FSTYPES += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \ + "boot.vfat recovery.vfat squashfs", \ + "boot.vfat recovery.vfat ext4.gz", d)}' IMAGE_FSTYPES:remove = "ext4" # ========================================================================= diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 3d33a0032..bd7e5bfa2 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -115,3 +115,17 @@ BOOTLOADER_SEEK_BOOTPART ?= "0" # This is otherwise forced by systemd because of hard-coded paths # in systemd source code. ROOT_HOME ?= "/root" + +# Default IMAGE_FSTYPES for eMMC/NAND +IMAGE_FSTYPES ?= "${@ \ + oe.utils.conditional('STORAGE_MEDIA', 'mmc', \ + bb.utils.contains('IMAGE_FEATURES', 'read-only-rootfs', \ + 'boot.vfat recovery.vfat squashfs tar.xz', \ + 'boot.vfat recovery.vfat ext4.gz tar.xz', d), \ + oe.utils.conditional('STORAGE_MEDIA', 'mtd', \ + bb.utils.contains('IMAGE_FEATURES', 'read-only-rootfs', \ + 'boot.ubifs recovery.ubifs squashfs tar.xz', \ + 'boot.ubifs recovery.ubifs ubifs tar.xz', d), \ + '' , d), \ + d) \ +}"