nrf54l15dk: add TF-M (/ns) support

Bring in changes needed in Zephyr and TF-M, and make needed adjustments. Support for TF-M in `nrf54l15pdk` is removed at the same time. Signed-off-by: Tomi Fontanilles <[email protected]>
nrfconnect · Sep 25, 2024 · 12c5853 · 12c5853
1 parent 3e7049e
commit 12c5853
Show file tree

Hide file tree

Showing 38 changed files with 82 additions and 92 deletions.
diff --git a/modules/trusted-firmware-m/Kconfig.tfm.defconfig b/modules/trusted-firmware-m/Kconfig.tfm.defconfig
@@ -10,7 +10,7 @@ config TFM_BOARD
 	default "${ZEPHYR_NRF_MODULE_DIR}/modules/trusted-firmware-m/tfm_boards/nrf9160" if SOC_NRF9160
 	default "${ZEPHYR_NRF_MODULE_DIR}/modules/trusted-firmware-m/tfm_boards/nrf9120" if SOC_NRF9120
 	default "${ZEPHYR_NRF_MODULE_DIR}/modules/trusted-firmware-m/tfm_boards/nrf5340_cpuapp" if SOC_NRF5340_CPUAPP
-	default "${ZEPHYR_NRF_MODULE_DIR}/modules/trusted-firmware-m/tfm_boards/nrf54l15_cpuapp" if SOC_SERIES_NRF54LX
+	default "${ZEPHYR_NRF_MODULE_DIR}/modules/trusted-firmware-m/tfm_boards/nrf54l15_cpuapp" if SOC_NRF54L15_CPUAPP
 	depends on TRUSTED_EXECUTION_NONSECURE
 
 if BUILD_WITH_TFM

diff --git a/modules/trusted-firmware-m/tfm_boards/CMakeLists.txt b/modules/trusted-firmware-m/tfm_boards/CMakeLists.txt
@@ -95,7 +95,7 @@ if (${TFM_PARTITION_CRYPTO})
        $<$<BOOL:${CONFIG_HW_UNIQUE_KEY_RANDOM}>:CONFIG_HW_UNIQUE_KEY_RANDOM>)
 
 
-       if((NRF_SOC_VARIANT STREQUAL nrf54l15) OR (target STREQUAL nrf54l15))
+       if(NRF_SOC_VARIANT STREQUAL nrf54l15)
           target_sources(platform_crypto_keys
             PRIVATE
              ${ZEPHYR_NRF_MODULE_DIR}/lib/hw_unique_key/hw_unique_key_cracen.c
@@ -207,7 +207,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/common
      DESTINATION ${INSTALL_PLATFORM_NS_DIR})
 
 
-if((NRF_SOC_VARIANT STREQUAL nrf54l15) OR (target STREQUAL nrf54l15))
+if(NRF_SOC_VARIANT STREQUAL nrf54l15)
   file(COPY ${ZEPHYR_NRF_MODULE_DIR}/subsys/nrf_security/src/drivers/cracen/cracenpsa/include/cracen_psa_key_ids.h
        DESTINATION ${INSTALL_INTERFACE_INC_DIR})
   file(COPY ${ZEPHYR_NRF_MODULE_DIR}/subsys/nrf_security/src/drivers/cracen/cracenpsa/include/cracen_psa_kmu.h

diff --git a/modules/trusted-firmware-m/tfm_boards/board/device_cfg.h b/modules/trusted-firmware-m/tfm_boards/board/device_cfg.h
@@ -13,7 +13,8 @@
 #undef ARRAY_SIZE
 #include <zephyr/devicetree.h>
 
-#if !defined(NRF54L15_ENGA_XXAA)
+#if !defined(NRF54L15_XXAA)
+
 #if defined(CONFIG_TFM_SECURE_UART0) || DOMAIN_NS == 1U
 #define TFM_UART uart0
 #endif /* defined(CONFIG_TFM_SECURE_UART0) || DOMAIN_NS == 1U */
@@ -22,7 +23,8 @@
 #define TFM_UART uart1
 #endif /* defined(CONFIG_TFM_SECURE_UART1) */
 
-#else /* NRF54L15_ENGA_XXAA */
+#else /* NRF54L15_XXAA */
+
 #if defined(CONFIG_TFM_SECURE_UART00) && DOMAIN_NS != 1U
 #define TFM_UART uart00
 #endif /* defined(CONFIG_TFM_SECURE_UART00) */
@@ -42,7 +44,8 @@
 #if defined(CONFIG_TFM_SECURE_UART30) && DOMAIN_NS != 1U
 #define TFM_UART uart30
 #endif /* defined(CONFIG_TFM_SECURE_UART30) */
-#endif /* NRF54L15_ENGA_XXAA */
+
+#endif /* NRF54L15_XXAA */
 
 #define DEFAULT_UART_BAUDRATE DT_PROP_OR(DT_NODELABEL(TFM_UART), current_speed, 115200)
 

diff --git a/modules/trusted-firmware-m/tfm_boards/nrf54l15_cpuapp/CMakeLists.txt b/modules/trusted-firmware-m/tfm_boards/nrf54l15_cpuapp/CMakeLists.txt
@@ -27,7 +27,7 @@ target_include_directories(platform_s
   ${ZEPHYR_BASE}/soc/nordic/common
   )
 
-# nrf54l15_enga_application.h should be defining __ICACHE_PRESENT, but
+# nrf54l15_application.h should be defining __ICACHE_PRESENT, but
 # it is not, until this is fixed we define it here.
 target_compile_definitions(platform_s
   PRIVATE

diff --git a/samples/crypto/aes_cbc/sample.yaml b/samples/crypto/aes_cbc/sample.yaml
@@ -31,7 +31,7 @@ tests:
     tags: introduction psa cracen sysbuild ci_samples_crypto
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -40,7 +40,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   sample.aes_cbc.cracen.crypto_service:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto ci_samples_crypto

diff --git a/samples/crypto/aes_ccm/sample.yaml b/samples/crypto/aes_ccm/sample.yaml
@@ -31,7 +31,7 @@ tests:
     tags: introduction psa cracen sysbuild ci_samples_crypto
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -40,7 +40,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   sample.aes_ccm.cracen.crypto_service:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto ci_samples_crypto

diff --git a/samples/crypto/aes_ctr/sample.yaml b/samples/crypto/aes_ctr/sample.yaml
@@ -31,7 +31,7 @@ tests:
     tags: introduction psa cracen sysbuild ci_samples_crypto
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -40,7 +40,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   sample.aes_ctr.cracen.crypto_service:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto ci_samples_crypto

diff --git a/samples/crypto/aes_gcm/sample.yaml b/samples/crypto/aes_gcm/sample.yaml
@@ -42,7 +42,7 @@ tests:
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp
       nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -51,7 +51,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   sample.aes_gcm.cracen.crypto_service:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto ci_samples_crypto

diff --git a/samples/crypto/chachapoly/sample.yaml b/samples/crypto/chachapoly/sample.yaml
@@ -32,7 +32,7 @@ tests:
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp
       nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -41,7 +41,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   sample.chachapoly.cracen.crypto_service:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto ci_samples_crypto

diff --git a/samples/crypto/ecdh/sample.yaml b/samples/crypto/ecdh/sample.yaml
@@ -31,7 +31,7 @@ tests:
     tags: introduction psa cracen sysbuild ci_samples_crypto
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -40,7 +40,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   sample.ecdh.cracen.crypto_service:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto ci_samples_crypto

diff --git a/samples/crypto/ecdsa/sample.yaml b/samples/crypto/ecdsa/sample.yaml
@@ -31,7 +31,7 @@ tests:
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp
       nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -40,7 +40,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   sample.ecdsa.cracen.crypto_service:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto ci_samples_crypto

diff --git a/samples/crypto/ecjpake/sample.yaml b/samples/crypto/ecjpake/sample.yaml
@@ -37,7 +37,7 @@ tests:
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp
       nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -46,7 +46,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   sample.ecjpake.cracen.crypto_service:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto ci_samples_crypto

diff --git a/samples/crypto/eddsa/sample.yaml b/samples/crypto/eddsa/sample.yaml
@@ -30,7 +30,7 @@ tests:
     tags: introduction psa cracen sysbuild ci_samples_crypto
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -39,7 +39,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   sample.eddsa.cracen.crypto_service:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto ci_samples_crypto

diff --git a/samples/crypto/hkdf/sample.yaml b/samples/crypto/hkdf/sample.yaml
@@ -29,7 +29,7 @@ tests:
     tags: introduction psa cracen sysbuild ci_samples_crypto
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -38,7 +38,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   sample.hkdf.cracen.crypto_service:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto ci_samples_crypto

diff --git a/samples/crypto/hmac/sample.yaml b/samples/crypto/hmac/sample.yaml
@@ -31,7 +31,7 @@ tests:
     tags: introduction psa cracen sysbuild ci_samples_crypto
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -40,7 +40,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   sample.hmac.cracen.crypto_service:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto ci_samples_crypto

diff --git a/samples/crypto/pbkdf2/sample.yaml b/samples/crypto/pbkdf2/sample.yaml
@@ -29,7 +29,7 @@ tests:
     tags: introduction psa cracen sysbuild ci_samples_crypto
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -38,7 +38,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   sample.pbkdf2.cracen.crypto_service:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto ci_samples_crypto

diff --git a/samples/crypto/persistent_key_usage/sample.yaml b/samples/crypto/persistent_key_usage/sample.yaml
@@ -33,7 +33,7 @@ tests:
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp
       nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -42,4 +42,4 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
diff --git a/samples/crypto/psa_tls/sample.yaml b/samples/crypto/psa_tls/sample.yaml
@@ -118,11 +118,11 @@ tests:
       OVERLAY_CONFIG="overlays/server.conf;overlays/ecdsa.conf;overlays/cracen-psa.conf"
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
     tags: ci_build cracen sysbuild ci_samples_crypto
   sample.psa_tls.client.ecdsa.cracen:
     sysbuild: true
@@ -131,11 +131,11 @@ tests:
       OVERLAY_CONFIG="overlays/client.conf;overlays/ecdsa.conf;overlays/cracen-psa.conf"
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
     tags: ci_build cracen sysbuild ci_samples_crypto
   ################################################################################
   ## Legacy APIs with Cryptocell (secure-only)

diff --git a/samples/crypto/rng/sample.yaml b/samples/crypto/rng/sample.yaml
@@ -29,7 +29,7 @@ tests:
     tags: introduction psa cracen sysbuild ci_samples_crypto
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -38,7 +38,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   sample.rng.cracen.crypto_service:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto ci_samples_crypto

diff --git a/samples/crypto/rsa/sample.yaml b/samples/crypto/rsa/sample.yaml
@@ -30,7 +30,7 @@ tests:
     tags: introduction psa cracen sysbuild ci_samples_crypto
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -39,4 +39,4 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
diff --git a/samples/crypto/sha256/sample.yaml b/samples/crypto/sha256/sample.yaml
@@ -29,7 +29,7 @@ tests:
     tags: introduction psa cracen sysbuild ci_samples_crypto
     platform_allow: >
         nrf54l15dk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp
-        nrf54l15pdk/nrf54l15/cpuapp/ns
+        nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -38,7 +38,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   # Build integration regression protection.
   sample.nrf_security.sha256.integration:
     sysbuild: true

diff --git a/samples/crypto/spake2p/sample.yaml b/samples/crypto/spake2p/sample.yaml
@@ -31,7 +31,7 @@ tests:
     platform_allow: >
       nrf54l15dk/nrf54l15/cpuapp
       nrf54l15pdk/nrf54l15/cpuapp
-      nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15dk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
       type: multi_line
@@ -40,7 +40,7 @@ tests:
     integration_platforms:
       - nrf54l15dk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
-      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54l15dk/nrf54l15/cpuapp/ns
   sample.spake2p.cracen.crypto_service:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto ci_samples_crypto