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

move IMAGE_FSTYPES to digi-defaults.inc 

IMAGE_FSTYPES was declared on each platform config file, but it has the
same values for all platforms depending on the storage media (mmc or mtd)
and whether read-only is enabled.

Move the conditional weak assignment to digi-default.inc and remove it from
each platform config.
In the case of STM platforms, since IMAGE_FSTYPES is weak-assigned by STM
layer, we still need to append/remove from it inside the platform config,
but move it to the family includes, rather than declaring it on each
specific platform.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2025-06-13 12:37:02 +02:00
parent 57f0575ad0
commit 0aed6a9c73
15 changed files with 24 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta-digi-arm/conf/machine/ccimx6qpsbc.conf
View File

@ -47,11 +47,6 @@ BT_TTY ?= "ttymxc1"
# XBee # XBee
XBEE_TTY ?= "ttymxc4" 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 # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = " \ BOOTABLE_ARTIFACTS = " \
u-boot-ccimx6qpsbc1GB.imx \ u-boot-ccimx6qpsbc1GB.imx \

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

@ -49,11 +49,6 @@ BT_TTY ?= "ttymxc1"
# XBee # XBee
XBEE_TTY ?= "ttymxc4" 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 # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = " \ BOOTABLE_ARTIFACTS = " \
u-boot-ccimx6dlsbc512MB.imx \ u-boot-ccimx6dlsbc512MB.imx \

5
meta-digi-arm/conf/machine/ccimx6ulsbc.conf
View File

@ -34,11 +34,6 @@ BT_TTY ?= "ttymxc0"
# XBee # XBee
XBEE_TTY ?= "ttymxc1" 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 # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = " \ BOOTABLE_ARTIFACTS = " \
u-boot-ccimx6ulsbc1GB.imx \ u-boot-ccimx6ulsbc1GB.imx \

5
meta-digi-arm/conf/machine/ccimx6ulstarter.conf
View File

@ -30,11 +30,6 @@ SERIAL_CONSOLES ?= "115200;ttymxc4"
# Bluetooth tty # Bluetooth tty
BT_TTY ?= "ttymxc0" 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 for install scripts
DEFAULT_IMAGE_NAME ?= "core-image-base" DEFAULT_IMAGE_NAME ?= "core-image-base"

5
meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
View File

@ -54,11 +54,6 @@ XBEE_RESET_N_GPIO ?= "mca-gpio@15,gpio1@8"
XBEE_SLEEP_RQ_GPIO ?= "mca-gpio@11,gpio1@7" XBEE_SLEEP_RQ_GPIO ?= "mca-gpio@11,gpio1@7"
XBEE_TTY ?= "ttymxc3" 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 # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mm-dvk.bin" BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mm-dvk.bin"

5
meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
View File

@ -55,11 +55,6 @@ XBEE_RESET_N_GPIO ?= "mca-gpio@15,gpio1@8"
XBEE_SLEEP_RQ_GPIO ?= "mca-gpio@11,gpio1@7" XBEE_SLEEP_RQ_GPIO ?= "mca-gpio@11,gpio1@7"
XBEE_TTY ?= "ttymxc3" 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 # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mn-dvk.bin" BOOTABLE_ARTIFACTS = "imx-boot-ccimx8mn-dvk.bin"

5
meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf
View File

@ -32,11 +32,6 @@ XBEE_RESET_N_GPIO ?= "gpio3@13"
XBEE_SLEEP_RQ_GPIO ?= "gpio3@16" XBEE_SLEEP_RQ_GPIO ?= "gpio3@16"
XBEE_TTY ?= "ttyLP0" 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 # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = " \ BOOTABLE_ARTIFACTS = " \
imx-boot-ccimx8x-sbc-express-B0.bin \ imx-boot-ccimx8x-sbc-express-B0.bin \

5
meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf
View File

@ -47,11 +47,6 @@ XBEE_RESET_N_GPIO ?= "mca-gpio@15"
XBEE_SLEEP_RQ_GPIO ?= "mca-gpio@11" XBEE_SLEEP_RQ_GPIO ?= "mca-gpio@11"
XBEE_TTY ?= "ttyMCA0" 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 # Boot artifacts to be copied from the deploy dir to the installer ZIP
BOOTABLE_ARTIFACTS = " \ BOOTABLE_ARTIFACTS = " \
imx-boot-ccimx8x-sbc-pro-B0.bin \ imx-boot-ccimx8x-sbc-pro-B0.bin \

10
meta-digi-arm/conf/machine/ccmp13-dvk.conf
View File

@ -84,16 +84,6 @@ MACHINE_EXTRA_RRECOMMENDS += " \
${MACHINE_FIRMWARE} \ ${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 for install scripts
DEFAULT_IMAGE_NAME ?= "core-image-base" DEFAULT_IMAGE_NAME ?= "core-image-base"

10
meta-digi-arm/conf/machine/ccmp15-dvk.conf
View File

@ -97,16 +97,6 @@ MACHINE_EXTRA_RRECOMMENDS += " \
${MACHINE_FIRMWARE} \ ${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 for install scripts
DEFAULT_IMAGE_NAME ?= "dey-image-webkit" DEFAULT_IMAGE_NAME ?= "dey-image-webkit"

10
meta-digi-arm/conf/machine/ccmp25-dvk.conf
View File

@ -109,16 +109,6 @@ MACHINE_EXTRA_RRECOMMENDS += " \
${MACHINE_FIRMWARE} \ ${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 for install scripts
DEFAULT_IMAGE_NAME ?= "dey-image-webkit" DEFAULT_IMAGE_NAME ?= "dey-image-webkit"

5
meta-digi-arm/conf/machine/include/ccimx9.inc
View File

@ -97,11 +97,6 @@ XBEE_RESET_N_GPIO ?= "gpio2@19"
XBEE_SLEEP_RQ_GPIO ?= "" XBEE_SLEEP_RQ_GPIO ?= ""
XBEE_TTY ?= "ttyLP3" 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 # Default overlayfs_etc mount point and type
OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data" OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data"
OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p7" OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p7"

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

@ -77,7 +77,11 @@ MACHINE_EXTRA_RRECOMMENDS:remove = "kernel-imagebootfs"
# ========================================================================= # =========================================================================
ALSA_LIST:stm32mp1common = "" 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:remove = "ext4"
IMAGE_FSTYPES:append = " ${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard', 'boot.vfat ext4.gz', '', d)}" IMAGE_FSTYPES:append = " ${@bb.utils.contains('BOOTDEVICE_LABELS', 'sdcard', 'boot.vfat ext4.gz', '', d)}"

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

@ -90,7 +90,11 @@ MACHINE_EXTRA_RDEPENDS += " \
# ========================================================================= # =========================================================================
ALSA_LIST:stm32mp2common = "" 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" IMAGE_FSTYPES:remove = "ext4"
# ========================================================================= # =========================================================================

14
meta-digi-arm/conf/machine/include/digi-defaults.inc
View File

@ -115,3 +115,17 @@ BOOTLOADER_SEEK_BOOTPART ?= "0"
# This is otherwise forced by systemd because of hard-coded paths # This is otherwise forced by systemd because of hard-coded paths
# in systemd source code. # in systemd source code.
ROOT_HOME ?= "/root" 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) \
}"