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

ccmp1/ccmp2: clear ALSA_LIST with override and move it to include file 

ALSA_LIST variable is weakly set through an override (stm32mp1common or
stm32mp2common). When the override is in place, the hard assignment of
the plain variable is not enough, and the value weakly set in
meta-st-stm32mp layer takes precedence over the plain variable hard
assignment.
Clear the variable with the override and move it from machine config files
to the include file.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
This commit is contained in:
Hector Palacios 2025-04-24 13:20:46 +02:00
parent 51116d4065
commit 3c6d3d356b
5 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,11 +147,6 @@ MACHINE_BLUETOOTH_EXTRA_INSTALL = ""
XBEE_RESET_N_GPIO ?= "GPIOG@15" XBEE_RESET_N_GPIO ?= "GPIOG@15"
XBEE_TTY ?= "ttySTM2" XBEE_TTY ?= "ttySTM2"
# =========================================================================
# alsa
# =========================================================================
ALSA_LIST = ""
# Per-machine DISTRO_FEATURES customization # Per-machine DISTRO_FEATURES customization
MACHINE_DISTRO_FEATURES_ADD = "efi optee" MACHINE_DISTRO_FEATURES_ADD = "efi optee"
MACHINE_DISTRO_FEATURES_REMOVE = "gstreamer opengl vulkan wayland x11" MACHINE_DISTRO_FEATURES_REMOVE = "gstreamer opengl vulkan wayland x11"

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

@ -158,11 +158,6 @@ MACHINE_BLUETOOTH_EXTRA_INSTALL = ""
XBEE_RESET_N_GPIO ?= "GPIOZ@2" XBEE_RESET_N_GPIO ?= "GPIOZ@2"
XBEE_TTY ?= "ttySTM2" XBEE_TTY ?= "ttySTM2"
# =========================================================================
# alsa
# =========================================================================
ALSA_LIST = ""
# Per-machine DISTRO_FEATURES customization # Per-machine DISTRO_FEATURES customization
MACHINE_DISTRO_FEATURES_ADD = "efi optee" MACHINE_DISTRO_FEATURES_ADD = "efi optee"
MACHINE_DISTRO_FEATURES_REMOVE = "vulkan x11" MACHINE_DISTRO_FEATURES_REMOVE = "vulkan x11"

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

@ -134,11 +134,6 @@ XBEE_RESET_N_GPIO ?= "GPIOD@6"
XBEE_SLEEP_RQ_GPIO ?= "" XBEE_SLEEP_RQ_GPIO ?= ""
XBEE_TTY ?= "ttySTM2" XBEE_TTY ?= "ttySTM2"
# =========================================================================
# alsa
# =========================================================================
ALSA_LIST = ""
# Disable use of vendorfs and userfs partitions # Disable use of vendorfs and userfs partitions
ST_VENDORFS = "0" ST_VENDORFS = "0"
ST_USERFS = "0" ST_USERFS = "0"

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

@ -71,6 +71,11 @@ MACHINE_EXTRA_RDEPENDS += " \
" "
MACHINE_EXTRA_RRECOMMENDS:remove = "kernel-imagebootfs" MACHINE_EXTRA_RRECOMMENDS:remove = "kernel-imagebootfs"
# =========================================================================
# alsa
# =========================================================================
ALSA_LIST:stm32mp1common = ""
# Image FS types # Image FS types
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)}"

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

@ -85,6 +85,11 @@ MACHINE_EXTRA_RDEPENDS += " \
xbee-init \ xbee-init \
" "
# =========================================================================
# alsa
# =========================================================================
ALSA_LIST:stm32mp2common = ""
# Image FS types # Image FS types
IMAGE_FSTYPES:remove = "ext4" IMAGE_FSTYPES:remove = "ext4"