From 6e5e6b9dc2f4f257c085733afc4807cb7aa13de5 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Fri, 20 Mar 2026 12:25:57 +0100 Subject: [PATCH] machine: ccmp1x/ccmp25: set STM32 header version per platform Since commit d29b92ed9935 ("CLASS: SIGN: manage signature for coprocessor") in meta-st-stm32mp from tag openstlinux-6.6-yocto-scarthgap-mpu-v26.02.18, the SIGN_HEADER_VERSION variable is required. Set the appropriate SIGN_HEADER_VERSION value for each platform. https://onedigi.atlassian.net/browse/DEL-10022 Signed-off-by: Arturo Buzarra --- meta-digi-arm/conf/machine/ccmp13-dvk.conf | 13 ++----------- meta-digi-arm/conf/machine/ccmp15-dvk.conf | 13 ++----------- meta-digi-arm/conf/machine/ccmp25-dvk.conf | 8 ++++++++ 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf index 75ecea431..9426c7510 100644 --- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf @@ -96,16 +96,6 @@ WKS_FILE += "ccmp1-256MB.wks.in" # For populate_sdk, gcc-arm-none-eabi_9 has a python2 dependency, so we remove it. ST_TOOLS_FOR_SDK:remove = "nativesdk-gcc-arm-none-eabi" -# ========================================================================= -# flashlayout -# ========================================================================= -# Define the config labels to use to generate flashlayout file - -# ========================================================================= -# extlinux configuration -# ========================================================================= -# As example, modify the default boot config for each target to M4 config - # ========================================================================= # Debug trace # ========================================================================= @@ -113,8 +103,9 @@ ST_TOOLS_FOR_SDK:remove = "nativesdk-gcc-arm-none-eabi" ST_DEBUG_TRACE = "0" # ========================================================================= -# Flashlayouts +# Signing configuration # ========================================================================= +SIGN_HEADER_VERSION_stm32mp13 ?= "2.0" # ========================================================================= # DEY settings diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf index d54090031..0fc721cf3 100644 --- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf @@ -112,16 +112,6 @@ WKS_FILES += " \ # For populate_sdk, gcc-arm-none-eabi_9 has a python2 dependency, so we remove it. ST_TOOLS_FOR_SDK:remove = "nativesdk-gcc-arm-none-eabi" -# ========================================================================= -# flashlayout -# ========================================================================= -# Define the config labels to use to generate flashlayout file - -# ========================================================================= -# extlinux configuration -# ========================================================================= -# As example, modify the default boot config for each target to M4 config - # ========================================================================= # Debug trace # ========================================================================= @@ -129,8 +119,9 @@ ST_TOOLS_FOR_SDK:remove = "nativesdk-gcc-arm-none-eabi" ST_DEBUG_TRACE = "0" # ========================================================================= -# Flashlayouts +# Signing configuration # ========================================================================= +SIGN_HEADER_VERSION_stm32mp15 ?= "1.0" # ========================================================================= # DEY settings diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf index 5030ce62e..c37e43b4e 100644 --- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf @@ -118,6 +118,14 @@ WKS_FILES += " \ ccmp2-1GB.wks.in \ " +# ========================================================================= +# Signing configuration +# ========================================================================= +SIGN_HEADER_VERSION_stm32mp25 ?= "2.2" + +# ========================================================================= +# DEY settings +# ========================================================================= # Wireless external module HAS_WIFI_VIRTWLANS = "true"