[nrf fromtree] platform: nordic_nrf: nrf7120: Fix build failures for CI

This fixes build issue of nordic_nrf/nrf7120dk_nrf7120_cpuapp
on tf-m upstream. The fix also aligns consistent with nrf54l
series.

Change-Id: I74a551accc6ee2d62b8dbeed193346bc1d7fd000
Signed-off-by: Travis Lam <travis.lam@nordicsemi.no>
(cherry picked from commit 553f21c)

Author: travis3630

platform/ext/target/nordic_nrf/common/core/target_cfg_71.c

@@ -37,8 +37,6 @@
 #include <hal/nrf_mramc.h>
 #include <hal/nrf_mpc.h>
 #include <hal/nrf_cache.h>
-#include "tfm_spm_log.h"
-
 
 #if !defined(DAUTH_CHIP_DEFAULT)
 #error "Debug access on this platform can only be configured by programming the corresponding registers in UICR."
@@ -313,6 +311,8 @@ void peripheral_configuration(void)
 	uint32_t uart_periph_start = tfm_peripheral_uarte22.periph_start;
 #elif NRF_SECURE_UART_INSTANCE == 30
 	uint32_t uart_periph_start = tfm_peripheral_uarte30.periph_start;
+#else
+#error "Unsupported NRF_SECURE_UART_INSTANCE for nrf71 series. Supported instances: 00, 20, 21, 22, 30"
 #endif
 	spu_peripheral_config_secure(uart_periph_start, SPU_LOCK_CONF_LOCKED);
 #endif /* SECURE_UART1 */

platform/ext/target/nordic_nrf/common/nrf7120/config.cmake

@@ -8,7 +8,6 @@
 
 include(${PLATFORM_PATH}/common/core/config.cmake)
 
-set(SECURE_UART30                       ON         CACHE BOOL      "Enable secure UART")
 set(BL2                                 OFF        CACHE BOOL      "Whether to build BL2" FORCE)
 set(NRF_NS_SECONDARY                    OFF        CACHE BOOL      "Enable non-secure secondary partition" FORCE)
-set(NRF_SECURE_UART_INSTANCE            30         CACHE STRING    "The UART instance number to use for secure UART")
+set(NRF_SECURE_UART_INSTANCE            30         CACHE STRING    "The UART instance number to use for secure UART" FORCE)

platform/ext/target/nordic_nrf/common/nrf7120/nrf71_init.c

@@ -15,6 +15,7 @@
 #define FLASH_PAGE_ERASE_MAX_TIME_US 42000UL
 #define FLASH_PAGE_MAX_CNT           381UL
 
+#ifdef DT_HAS_COMPAT_STATUS_OKAY
 #if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_pwr_antswc)
 
 #if !defined(CONFIG_TRUSTED_EXECUTION_NONSECURE) || defined(__NRF_TFM__)
@@ -25,6 +26,7 @@
 
 #define PWR_ANTSWC_ENABLE (0x3UL)
 #endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_pwr_antswc) */
+#endif /* DT_HAS_COMPAT_STATUS_OKAY */
 
 /* This handler needs to be ported to the upstream TF-M project when Cracen is supported there.
  * The implementation of this is currently in sdk-nrf. We define it to avoid warnings when we build
@@ -54,16 +56,20 @@ int  __attribute__((weak)) soc_early_init_hook(void){
 	wifi_setup();
 #endif
 
+#ifdef DT_HAS_COMPAT_STATUS_OKAY
 #if DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_pwr_antswc)
 	*(volatile uint32_t *)PWR_ANTSWC_REG |= PWR_ANTSWC_ENABLE;
-#endif
+#endif /* DT_HAS_COMPAT_STATUS_OKAY(nordic_nrf_pwr_antswc) */
+#endif /* DT_HAS_COMPAT_STATUS_OKAY */
 
 	/* Configure LFXO capacitive load if internal load capacitors are used */
+#ifdef DT_ENUM_HAS_VALUE
 #if DT_ENUM_HAS_VALUE(LFXO_NODE, load_capacitors, internal)
 	nrf_lfxo_cload_set(NRF_LFXO,
 			(uint8_t)(DT_PROP(LFXO_NODE, load_capacitance_femtofarad) / 1000));
-#endif
+#endif /* DT_ENUM_HAS_VALUE(LFXO_NODE, load_capacitors, internal) */
+#endif /* DT_ENUM_HAS_VALUE */
 
-#endif
+#endif /* CONFIG_TRUSTED_EXECUTION_NONSECURE && !__NRF_TFM__ */
 	return 0;
 }

platform/ext/target/nordic_nrf/common/nrf7120/partition/region_defs.h

@@ -97,7 +97,12 @@
 #define PSA_TEST_SCRATCH_AREA_SIZE (0x400)
 
 /* Even though BL2 is not supported now this needs to be defined becaused it is used by scatter files */
+#define BOOT_TFM_SHARED_DATA_BASE S_RAM_ALIAS_BASE
 #define BOOT_TFM_SHARED_DATA_SIZE (0x0)
+#define BOOT_TFM_SHARED_DATA_LIMIT (BOOT_TFM_SHARED_DATA_BASE + BOOT_TFM_SHARED_DATA_SIZE - 1)
+#define SHARED_BOOT_MEASUREMENT_BASE BOOT_TFM_SHARED_DATA_BASE
+#define SHARED_BOOT_MEASUREMENT_SIZE BOOT_TFM_SHARED_DATA_SIZE
+#define SHARED_BOOT_MEASUREMENT_LIMIT BOOT_TFM_SHARED_DATA_LIMIT
 
 #ifdef PSA_API_TEST_IPC
 /* Firmware Framework test suites */

platform/ext/target/nordic_nrf/nrf7120dk_nrf7120_cpuapp/CMakeLists.txt

@@ -34,7 +34,6 @@ if(BL2)
         PUBLIC
             partition
             ../common/nrf7120/partition
-        PRIVATE
             .
     )
 endif()
@@ -60,7 +59,7 @@ endif()
 
 install(FILES       RTE_Device.h
                     device_cfg.h
-                    ns/CMakeLists.txt
+                    ../common/nrf7120/ns/CMakeLists.txt
                     config.cmake
         DESTINATION ${INSTALL_PLATFORM_NS_DIR}
 )

platform/ext/target/nordic_nrf/nrf7120dk_nrf7120_cpuapp/tfm_peripherals_config.h

@@ -12,7 +12,9 @@ extern "C" {
 #endif
 
 #ifdef SECURE_UART1
-#if NRF_SECURE_UART_INSTANCE == 30
+#if NRF_SECURE_UART_INSTANCE == 20
+#define TFM_PERIPHERAL_UARTE20_SECURE 1
+#elif NRF_SECURE_UART_INSTANCE == 30
 #define TFM_PERIPHERAL_UARTE30_SECURE 1
 #endif
 #endif