From 3c6d3d356b2fa880b0c54d6045ccc847b5cb4b39 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Thu, 24 Apr 2025 13:20:46 +0200
Subject: [PATCH] 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>
---
 meta-digi-arm/conf/machine/ccmp13-dvk.conf   | 5 -----
 meta-digi-arm/conf/machine/ccmp15-dvk.conf   | 5 -----
 meta-digi-arm/conf/machine/ccmp25-dvk.conf   | 5 -----
 meta-digi-arm/conf/machine/include/ccmp1.inc | 5 +++++
 meta-digi-arm/conf/machine/include/ccmp2.inc | 5 +++++
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index 86bf5054a..405f76d5c 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -147,11 +147,6 @@ MACHINE_BLUETOOTH_EXTRA_INSTALL = ""
 XBEE_RESET_N_GPIO ?= "GPIOG@15"
 XBEE_TTY ?= "ttySTM2"
 
-# =========================================================================
-# alsa
-# =========================================================================
-ALSA_LIST = ""
-
 # Per-machine DISTRO_FEATURES customization
 MACHINE_DISTRO_FEATURES_ADD = "efi optee"
 MACHINE_DISTRO_FEATURES_REMOVE = "gstreamer opengl vulkan wayland x11"
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index 89890f290..a5591dc79 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -158,11 +158,6 @@ MACHINE_BLUETOOTH_EXTRA_INSTALL = ""
 XBEE_RESET_N_GPIO ?= "GPIOZ@2"
 XBEE_TTY ?= "ttySTM2"
 
-# =========================================================================
-# alsa
-# =========================================================================
-ALSA_LIST = ""
-
 # Per-machine DISTRO_FEATURES customization
 MACHINE_DISTRO_FEATURES_ADD = "efi optee"
 MACHINE_DISTRO_FEATURES_REMOVE = "vulkan x11"
diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf
index b58f73999..a6420f48a 100644
--- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf
@@ -134,11 +134,6 @@ XBEE_RESET_N_GPIO ?= "GPIOD@6"
 XBEE_SLEEP_RQ_GPIO ?= ""
 XBEE_TTY ?= "ttySTM2"
 
-# =========================================================================
-# alsa
-# =========================================================================
-ALSA_LIST = ""
-
 # Disable use of vendorfs and userfs partitions
 ST_VENDORFS = "0"
 ST_USERFS   = "0"
diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc
index 46d3a9d73..8ea9db1b2 100644
--- a/meta-digi-arm/conf/machine/include/ccmp1.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp1.inc
@@ -71,6 +71,11 @@ MACHINE_EXTRA_RDEPENDS += " \
 "
 MACHINE_EXTRA_RRECOMMENDS:remove = "kernel-imagebootfs"
 
+# =========================================================================
+# alsa
+# =========================================================================
+ALSA_LIST:stm32mp1common = ""
+
 # Image FS types
 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 a5020a602..6929110f5 100644
--- a/meta-digi-arm/conf/machine/include/ccmp2.inc
+++ b/meta-digi-arm/conf/machine/include/ccmp2.inc
@@ -85,6 +85,11 @@ MACHINE_EXTRA_RDEPENDS += " \
     xbee-init \
 "
 
+# =========================================================================
+# alsa
+# =========================================================================
+ALSA_LIST:stm32mp2common = ""
+
 # Image FS types
 IMAGE_FSTYPES:remove = "ext4"