From a44aa6e521edb9d21613e709ecb9a2ebde8ea16d Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 29 May 2023 12:18:40 +0200 Subject: [PATCH] ccmp15: add MCA DT overlay support This commit modifies the boot script condition to apply the overlay for MCA based on HWID MCA field. https://onedigi.atlassian.net/browse/DEL-8521 Signed-off-by: Arturo Buzarra --- meta-digi-arm/conf/machine/ccmp15-dvk.conf | 1 + .../recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index 1adbffbcb..5179bc3f0 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -50,6 +50,7 @@ STM32MP_KERNEL_DEVICETREE:ccmp15-dvk += " \ _ov_board_v1_ccmp15-dvk.dtbo \ _ov_som_bt_ccmp15.dtbo \ _ov_som_bt_test_ccmp15.dtbo \ + _ov_som_mca_ccmp15.dtbo \ _ov_som_wifi_ccmp15.dtbo \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt index 9cf317362..0bfbc4de6 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt @@ -45,6 +45,8 @@ setenv ORIG_overlays ${overlays} # Determine overlays to apply depending on the hardware capabilities # described by the HWID, SOM version, and carrier board version. # +setexpr module_has_mca ${hwid_2} \& 10000 +setexpr module_has_mca ${module_has_mca} / 10000 setexpr module_has_wifi ${hwid_2} \& 20000 setexpr module_has_wifi ${module_has_wifi} / 20000 setexpr module_has_bt ${hwid_2} \& 40000 @@ -58,6 +60,10 @@ if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then setenv overlays _ov_som_wifi_ccmp15.dtbo,${overlays} fi +if test "${module_has_mca}" = "1" && test -z "${disable_mca}"; then + setenv overlays _ov_som_mca_ccmp15.dtbo,${overlays} +fi + # Apply DVKv1 overlay if the board_version is 1 if test -z "${board_version}" || test "${board_version}" -eq "1"; then setenv overlays _ov_board_v1_ccmp15-dvk.dtbo,${overlays}