diff mbox series

[1/1] arm/trusted-firmware-m: Remove duplicate config in the cmake file.

Message ID 20250617163011.2238429-2-yogesh.wani@arm.com
State New
Headers show
Series arm/trusted-firmware-m: Remove duplicate config in the cmake file. | expand

Commit Message

Yogesh Wani June 17, 2025, 4:30 p.m. UTC 
The PS_NUM_ASSET is duplicated in the cmake.config and the config_tfm_target.h file
under corstone-1000. The commit removes the one from the cmake.config and keeps the
one in the header file.

The whole rationale behind this is for the vendor to be able to override the
configuration using the cmake file.

Signed-off-by: Yogesh Wani <yogesh.wani@arm.com>
---
 ...e-duplicate-configuration-parameters.patch | 30 +++++++++++++++++++
 .../trusted-firmware-m-corstone1000.inc       |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0023-Platform-CS1000-Remove-duplicate-configuration-parameters.patch
diff mbox series

Patch

diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0023-Platform-CS1000-Remove-duplicate-configuration-parameters.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0023-Platform-CS1000-Remove-duplicate-configuration-parameters.patch
new file mode 100644
index 00000000..76761c9a
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/0023-Platform-CS1000-Remove-duplicate-configuration-parameters.patch
@@ -0,0 +1,30 @@ 
+From 456a58e4cb06c9cbdaadfc3d2e54ef21ec8405fc Mon Sep 17 00:00:00 2001
+From: Yogesh Wani <yogesh.wani@arm.com>
+Date: Wed, 7 May 2025 16:51:27 +0000
+Subject: [PATCH] Remove duplicate configuration parameters for corstone-1000
+
+The PS_NUM_ASSET is duplicated in the cmake.config and the
+config_tfm_target.h file under corstone-1000. The commit removes
+the one from the cmake.config and keeps the one in the header file.
+
+The whole rationale behind this is for the vendor to be able
+to override the configuration using the cmake file.
+
+Signed-off-by: Yogesh Wani <yogesh.wani@arm.com>
+Upstream-Status: Submitted
+---
+ platform/ext/target/arm/corstone1000/config.cmake | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/platform/ext/target/arm/corstone1000/config.cmake b/platform/ext/target/arm/corstone1000/config.cmake
+index 6a805a1220..708bacaedf 100644
+--- a/platform/ext/target/arm/corstone1000/config.cmake
++++ b/platform/ext/target/arm/corstone1000/config.cmake
+@@ -68,4 +68,3 @@ endif()
+ # Platform-specific configurations
+ set(CONFIG_TFM_USE_TRUSTZONE            OFF)
+ set(TFM_MULTI_CORE_TOPOLOGY             ON)
+-set(PS_NUM_ASSETS                       "40"        CACHE STRING    "The maximum number of assets to be stored in the Protected Storage area")
+--
+2.34.1
+
diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc
index c79ac2e3..e3a07b72 100644
--- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc
+++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc
@@ -41,6 +41,7 @@  SRC_URI:append:corstone1000 = " \
     file://0020-Platform-CS1000-Validate-both-metadata-replicas.patch \
     file://0021-platform-corstone1000-add-unique-guid-for-mps3.patch \
     file://0022-CC312-alignment-of-cc312-differences.patch \
+    file://0023-Platform-CS1000-Remove-duplicate-configuration-parameters.patch \
     "
 
 FILESEXTRAPATHS:prepend:corstone1000-mps3 := "${THISDIR}/files/corstone1000/psa-adac:"