[nrf fromlist] platform: Add platform default UART control definition

Add platform default UART control definition. For platforms that wishes to use a UART configuration different from the default CMSIS control value the default valuse need to be supplied in the call to set control. This makes it possible for a platform to set for example Hardware Flow Contol configuration. Having support for Hardware Flow Control is useful for running the TF-M regression tests reliably. Upstream PR: https://review.trustedfirmware.org/c/TF-M/trusted-firmware-m/+/20374 Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
frkv · Apr 18, 2023 · f16b472 · f16b472
1 parent 4b5eb25
commit f16b472
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 1 deletion.
diff --git a/platform/ext/common/uart_stdout.c b/platform/ext/common/uart_stdout.c
@@ -93,7 +93,7 @@ void stdio_init(void)
     ret = STDIO_DRIVER.PowerControl(ARM_POWER_FULL);
     ASSERT_HIGH(ret);
 
-    ret = STDIO_DRIVER.Control(ARM_USART_MODE_ASYNCHRONOUS,
+    ret = STDIO_DRIVER.Control(DEFAULT_UART_CONTROL | ARM_USART_MODE_ASYNCHRONOUS,
                                DEFAULT_UART_BAUDRATE);
     ASSERT_HIGH(ret);
     (void)ret;

diff --git a/platform/ext/target/arm/corstone1000/Device/Config/device_cfg.h b/platform/ext/target/arm/corstone1000/Device/Config/device_cfg.h
@@ -20,6 +20,7 @@
 /*ARM UART Controller PL011*/
 #define UART0_PL011
 
+#define DEFAULT_UART_CONTROL 0
 /* Default UART baud rate */
 #define DEFAULT_UART_BAUDRATE 115200
 

diff --git a/platform/ext/target/arm/mps2/an519/device_cfg.h b/platform/ext/target/arm/mps2/an519/device_cfg.h
@@ -34,6 +34,7 @@
 #define APB_PPCEXP2_S
 
 /* ARM UART */
+#define DEFAULT_UART_CONTROL 0
 #define DEFAULT_UART_BAUDRATE  115200
 #define ARM_UART0_S
 #define ARM_UART0_NS

diff --git a/platform/ext/target/arm/mps2/an521/device_cfg.h b/platform/ext/target/arm/mps2/an521/device_cfg.h
@@ -34,6 +34,7 @@
 #define APB_PPCEXP2_S
 
 /* ARM UART */
+#define DEFAULT_UART_CONTROL 0
 #define DEFAULT_UART_BAUDRATE  115200
 #define ARM_UART0_S
 #define ARM_UART0_NS

diff --git a/platform/ext/target/arm/mps3/an524/device/config/device_cfg.h b/platform/ext/target/arm/mps3/an524/device/config/device_cfg.h
@@ -40,6 +40,7 @@
 #define APB_PPCEXP2_S
 
 /* ARM UART CMSDK */
+#define DEFAULT_UART_CONTROL 0
 #define DEFAULT_UART_BAUDRATE  115200
 #define UART0_CMSDK_S
 #define UART0_CMSDK_NS

diff --git a/platform/ext/target/arm/mps3/an547/device/config/device_cfg.h b/platform/ext/target/arm/mps3/an547/device/config/device_cfg.h
@@ -44,6 +44,7 @@
 #define PPC_SSE300_PERIPH_EXP3_S
 
 /* ARM UART CMSDK */
+#define DEFAULT_UART_CONTROL 0
 #define DEFAULT_UART_BAUDRATE  115200
 #define UART0_CMSDK_NS
 

diff --git a/platform/ext/target/arm/mps3/an552/device/config/device_cfg.h b/platform/ext/target/arm/mps3/an552/device/config/device_cfg.h
@@ -44,6 +44,7 @@
 #define PPC_SSE300_PERIPH_EXP3_S
 
 /* ARM UART CMSDK */
+#define DEFAULT_UART_CONTROL 0
 #define DEFAULT_UART_BAUDRATE  115200
 #define UART0_CMSDK_NS
 

diff --git a/platform/ext/target/arm/mps3/corstone310/fvp/device/config/device_cfg.h b/platform/ext/target/arm/mps3/corstone310/fvp/device/config/device_cfg.h
@@ -23,6 +23,7 @@
  * platform's device definition
  */
 
+#define DEFAULT_UART_CONTROL 0
 #define DEFAULT_UART_BAUDRATE  115200
 
 /**

diff --git a/platform/ext/target/arm/musca_b1/Device/Config/device_cfg.h b/platform/ext/target/arm/musca_b1/Device/Config/device_cfg.h
@@ -88,6 +88,7 @@
 #define SE_MHU_RECEIVER_DEV    SE_MHU_RECEIVER_DEV_S
 #endif
 
+#define DEFAULT_UART_CONTROL 0
 /* Default UART baud rate */
 #define DEFAULT_UART_BAUDRATE 115200
 

diff --git a/platform/ext/target/arm/musca_s1/Device/Config/device_cfg.h b/platform/ext/target/arm/musca_s1/Device/Config/device_cfg.h
@@ -65,6 +65,7 @@
 /* Cache */
 #define SSE_200_CACHE_S
 
+#define DEFAULT_UART_CONTROL 0
 /* Default UART baud rate */
 #define DEFAULT_UART_BAUDRATE 115200
 

diff --git a/platform/ext/target/arm/rss/common/device/config/device_cfg.h b/platform/ext/target/arm/rss/common/device/config/device_cfg.h
@@ -45,6 +45,7 @@
 #define ATU_S
 
 /* ARM UART PL011 */
+#define DEFAULT_UART_CONTROL 0
 #define DEFAULT_UART_BAUDRATE  115200
 #define UART0_PL011_S
 #define UART0_PL011_NS

diff --git a/platform/ext/target/cypress/psoc64/Device/Config/device_cfg.h b/platform/ext/target/cypress/psoc64/Device/Config/device_cfg.h
@@ -32,6 +32,7 @@
 #define CY_TCPWM0_TIMER0_S
 #define CY_TCPWM0_TIMER1_NS
 
+#define DEFAULT_UART_CONTROL 0
 #define DEFAULT_UART_BAUDRATE  115200
 
 #endif  /* __ARM_LTD_DEVICE_CFG_H__ */
diff --git a/platform/ext/target/lairdconnectivity/common/bl5340/device_cfg.h b/platform/ext/target/lairdconnectivity/common/bl5340/device_cfg.h
@@ -25,6 +25,7 @@
  * address.
  */
 
+#define DEFAULT_UART_CONTROL 0
 #define DEFAULT_UART_BAUDRATE  115200
 
 #endif /* __ARM_LTD_DEVICE_CFG_H__ */
diff --git a/platform/ext/target/nordic_nrf/nrf5340dk_nrf5340_cpuapp/device_cfg.h b/platform/ext/target/nordic_nrf/nrf5340dk_nrf5340_cpuapp/device_cfg.h
@@ -25,6 +25,7 @@
  * address.
  */
 
+#define DEFAULT_UART_CONTROL 0
 #define DEFAULT_UART_BAUDRATE  115200
 
 #endif /* __ARM_LTD_DEVICE_CFG_H__ */
diff --git a/platform/ext/target/nordic_nrf/nrf9160dk_nrf9160/device_cfg.h b/platform/ext/target/nordic_nrf/nrf9160dk_nrf9160/device_cfg.h
@@ -25,6 +25,7 @@
  * address.
  */
 
+#define DEFAULT_UART_CONTROL 0
 #define DEFAULT_UART_BAUDRATE  115200
 
 #endif /* __ARM_LTD_DEVICE_CFG_H__ */
diff --git a/platform/ext/target/nuvoton/m2351/device/config/device_cfg.h b/platform/ext/target/nuvoton/m2351/device/config/device_cfg.h
@@ -28,6 +28,7 @@
 #include "NuMicro.h"
 
 /* ARM UART CMSDK */
+#define DEFAULT_UART_CONTROL 0
 #define DEFAULT_UART_BAUDRATE 115200
 #define UART0_CMSDK_S
 #define UART0_CMSDK_NS

diff --git a/platform/ext/target/nuvoton/m2354/device/config/device_cfg.h b/platform/ext/target/nuvoton/m2354/device/config/device_cfg.h
@@ -28,6 +28,7 @@
 #include "NuMicro.h"
 
 /* ARM UART CMSDK */
+#define DEFAULT_UART_CONTROL 0
 #define DEFAULT_UART_BAUDRATE 115200
 #define UART0_CMSDK_S
 #define UART0_CMSDK_NS

diff --git a/platform/ext/target/nxp/lpcxpresso55s69/Device/Config/device_cfg.h b/platform/ext/target/nxp/lpcxpresso55s69/Device/Config/device_cfg.h
@@ -39,6 +39,7 @@
 /*ARM UART Controller */
 //TBD
 
+#define DEFAULT_UART_CONTROL 0
 /* Default UART baud rate */
 #define DEFAULT_UART_BAUDRATE 115200
 

diff --git a/platform/ext/target/stm/b_u585i_iot02a/include/device_cfg.h b/platform/ext/target/stm/b_u585i_iot02a/include/device_cfg.h
@@ -28,6 +28,7 @@
  */
 
 
+#define DEFAULT_UART_CONTROL 0
 /* Default UART baud rate */
 #define DEFAULT_UART_BAUDRATE 115200
 

diff --git a/platform/ext/target/stm/nucleo_l552ze_q/include/device_cfg.h b/platform/ext/target/stm/nucleo_l552ze_q/include/device_cfg.h
@@ -28,6 +28,7 @@
  */
 
 
+#define DEFAULT_UART_CONTROL 0
 /* Default UART baud rate */
 #define DEFAULT_UART_BAUDRATE 115200
 

diff --git a/platform/ext/target/stm/stm32l562e_dk/include/device_cfg.h b/platform/ext/target/stm/stm32l562e_dk/include/device_cfg.h
@@ -28,6 +28,7 @@
  */
 
 
+#define DEFAULT_UART_CONTROL 0
 /* Default UART baud rate */
 #define DEFAULT_UART_BAUDRATE 115200
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ @@
      * platform's device definition
      */
+    #define DEFAULT_UART_CONTROL 0
     #define DEFAULT_UART_BAUDRATE  115200
     /**
@@ Expand Down @@