platform: nordic_nrf: unify target configuration header

Unify the target configuration header, the target configuration source has already been unified. Change-Id: I23e3b47ac8e80fb5e54a24660fbb4e8313f54c78 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
vili-nordic · Dec 13, 2023 · 7316fe1 · 7316fe1
1 parent 7eace88
commit 7316fe1
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 293 deletions.
diff --git a/platform/ext/target/lairdconnectivity/common/bl5340/target_cfg.h b/platform/ext/target/lairdconnectivity/common/bl5340/target_cfg.h
diff --git a/platform/ext/target/nordic_nrf/common/core/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/core/CMakeLists.txt
@@ -187,6 +187,7 @@ install(FILES       startup.c
 )
 
 install(FILES       startup.h
+                    target_cfg.h
                     nrfx_config.h
                     ns/CMakeLists.txt
                     config.cmake

diff --git a/...et/nordic_nrf/common/nrf5340/target_cfg.h → ...arget/nordic_nrf/common/core/target_cfg.h b/...et/nordic_nrf/common/nrf5340/target_cfg.h → ...arget/nordic_nrf/common/core/target_cfg.h
@@ -20,11 +20,11 @@
 
 /**
  * \file target_cfg.h
- * \brief nRF5340 target configuration header
+ * \brief Target configuration header
  *
  * This file contains the platform specific functions to configure
- * the Cortex-M33 core, memory permissions and security attribution
- * on the nRF5340 platform.
+ * the Cortex-M33 core, memory permissions and security attribution.
+ * on the nordic_nrf platform.
  *
  * Memory permissions and security attribution are configured via
  * the System Protection Unit (SPU) which is the nRF specific Implementation
@@ -80,7 +80,8 @@ enum tfm_plat_err_t spu_init_cfg(void);
  * - grants Non-Secure access to nRF peripherals that are not Secure-only
  * - grants Non-Secure access to DDPI channels
  * - grants Non-Secure access to GPIO pins
- * - enforces that the external domain is still at the HW reset value of non-secure and locking it
+ * - On nrf5340 enforces that the external domain is still at the HW reset value
+ *   of non-secure and locking it
  *
  * \return Returns values as specified by the \ref tfm_plat_err_t
  */

diff --git a/platform/ext/target/nordic_nrf/common/nrf5340/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf5340/CMakeLists.txt
@@ -70,7 +70,6 @@ target_sources(tfm_spm
 #========================= Files for building NS side platform ================#
 
 install(FILES       nrfx_config_nrf5340_application.h
-                    target_cfg.h
                     ns/CMakeLists.txt
                     config.cmake
                     cpuarch.cmake

diff --git a/platform/ext/target/nordic_nrf/common/nrf91/CMakeLists.txt b/platform/ext/target/nordic_nrf/common/nrf91/CMakeLists.txt
@@ -72,7 +72,6 @@ target_sources(tfm_spm
 #========================= Files for building NS side platform ================#
 
 install(FILES       nrfx_config_nrf91.h
-                    target_cfg.h
                     ns/CMakeLists.txt
                     config.cmake
         DESTINATION ${INSTALL_PLATFORM_NS_DIR}/common/nrf91

diff --git a/platform/ext/target/nordic_nrf/common/nrf91/target_cfg.h b/platform/ext/target/nordic_nrf/common/nrf91/target_cfg.h