[nrf fromtree] platform: nordic_nrf: nrf7120: switch to uart20

Change to use from uart00 to uart20 in npse.

Change-Id: Ia6971598b97982edb49dda0eb6116ee640611eb9
Signed-off-by: Travis Lam <[email protected]>
(cherry picked from commit 0f6ade4902a6e3e8a7afc5c4560feb7560af123d)

Author: travis3630

platform/ext/target/nordic_nrf/common/core/target_cfg.h

@@ -59,18 +59,12 @@
 /* Only UART20 and UART30 are supported for TF-M tests, which are the
  * Non-secure applications build via the TF-M build system
  */
-#if defined(NRF54L_SERIES)
+#if defined(NRF54L_SERIES) || defined(NRF71_SERIES)
 #if NRF_SECURE_UART_INSTANCE == 20
 #define NS_DRIVER_STDIO     Driver_USART30
 #else
 #define NS_DRIVER_STDIO     Driver_USART20
 #endif
-#elif defined(NRF71_SERIES)
-#if defined(NRF_SECURE_UART_INSTANCE) && (NRF_SECURE_UART_INSTANCE == 00)
-#define NS_DRIVER_STDIO     Driver_USART30
-#else
-#define NS_DRIVER_STDIO     Driver_USART00
-#endif
 #else
 #define NS_DRIVER_STDIO     Driver_USART0
 #endif /* NRF54L_SERIES or NRF71_SERIES */

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

@@ -8,7 +8,7 @@
 
 include(${PLATFORM_PATH}/common/core/config.cmake)
 
-set(SECURE_UART30                       ON         CACHE BOOL      "Enable secure UART" FORCE)
+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" FORCE)
+set(NRF_SECURE_UART_INSTANCE            30         CACHE STRING    "The UART instance number to use for secure UART")

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

@@ -17,14 +17,14 @@
 #ifndef __RTE_DEVICE_H
 #define __RTE_DEVICE_H
 
-#define RTE_USART00 1
+#define RTE_USART20 1
 
-#define RTE_USART00_PINS         \
+#define RTE_USART20_PINS         \
 {                                \
-        NRF_PSEL(UART_TX,  2, 2),\
-        NRF_PSEL(UART_RX,  2, 0),\
-        NRF_PSEL(UART_RTS, 2, 5),\
-        NRF_PSEL(UART_CTS, 2, 4),\
+        NRF_PSEL(UART_TX,  1, 4),\
+        NRF_PSEL(UART_RX,  1, 5),\
+        NRF_PSEL(UART_RTS, 1, 6),\
+        NRF_PSEL(UART_CTS, 1, 7),\
 }