Support MPS3 AN524 UART0

Enable UART0 support to be able to print logs from Azure RTOS to serial
console.

Signed-off-by: Devaraj Ranganna <devaraj.ranganna@linaro.org>

Author: urutva

Arm/MPS3_AN524/app/CMakeLists.txt

@@ -6,6 +6,8 @@ set(LINKER_SCRIPT "${CMAKE_CURRENT_LIST_DIR}/startup/mps3_an524.ld")
 set(SOURCES
     startup/startup_cmsdk_mps3_an524_bl2.S
     main.c
+    board_init.c
+    console.c
 )
 
 add_executable(${PROJECT_NAME} ${SOURCES})

Arm/MPS3_AN524/app/board_init.c

@@ -0,0 +1,35 @@
+/* Copyright (c) 2021 Linaro Limited. */
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "board_init.h"
+
+/* Initialise uart console */
+static void console_init()
+{
+    int32_t ret;
+
+    /* Initialize the USART driver */
+    ret = Driver_USART0.Initialize(NULL);
+    assert(ret == ARM_DRIVER_OK);
+
+    /* Power up the USART peripheral */
+    ret = Driver_USART0.PowerControl(ARM_POWER_FULL);
+    assert(ret == ARM_DRIVER_OK);
+
+    /* Configure the USART to 115200 (DEFAULT_UART_BAUDRATE) Bits/sec */
+    ret = Driver_USART0.Control(ARM_USART_MODE_ASYNCHRONOUS,
+                               DEFAULT_UART_BAUDRATE);
+    assert(ret == ARM_DRIVER_OK);
+
+    /* Enable Transmitter line */
+    Driver_USART0.Control(ARM_USART_CONTROL_TX, 1);
+}
+
+/* Initialise the board */
+void board_init()
+{
+    /* Initialise uart console */
+    console_init();
+}

Arm/MPS3_AN524/app/board_init.h

@@ -0,0 +1,14 @@
+/* Copyright (c) 2021 Linaro Limited. */
+
+#ifndef _BOARD_INIT_H
+#define _BOARD_INIT_H
+
+#include "Driver_USART.h"
+#include "device_cfg.h"
+
+/* USART0 driver */
+extern ARM_DRIVER_USART Driver_USART0;
+
+void board_init();
+
+#endif // _BOARD_INIT_H

Arm/MPS3_AN524/app/console.c

@@ -0,0 +1,22 @@
+/* Copyright (c) 2021 Linaro Limited. */
+
+#include <assert.h>
+#include <stdio.h>
+
+#include "board_init.h"
+
+/* Override `_write` function to redirect printf to uart console */
+int _write(int fd, char *str, int len)
+{
+    (void)fd;
+    int32_t ret;
+
+    /* Send string and return the number of characters written */
+    ret = Driver_USART0.Send(str, len);
+    assert(ret == ARM_DRIVER_OK);
+
+    /* Add a busy wait after sending. */
+    while (Driver_USART0.GetStatus().tx_busy);
+
+    return Driver_USART0.GetTxCount();
+}

Arm/MPS3_AN524/app/main.c

@@ -2,9 +2,15 @@
 
 #include <stdio.h>
 
+#include "board_init.h"
+
 int main(void)
 {
-    /* ToDo: HW init (UART, pins, etc. ) */
+    /* Initialise the board */
+    board_init();
+
+    printf("Azure RTOS running on MPS3 board\n");
+
 
     /* tx_kernel_enter(); */
 

Arm/MPS3_AN524/lib/AN524/CMakeLists.txt

@@ -1,12 +1,10 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-# Exceptions required by CMSIS UART driver
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-ignored-qualifiers -Wno-return-type")
-
 set(SOURCES
     src/CMSIS/Driver_USART.c
     src/device/source/system_core_init.c
+    src/device/source/device_definition.c
     src/native_drivers/uart_cmsdk_drv.c
 )
 

Arm/MPS3_AN524/lib/AN524/src/device/source/device_definition.c

@@ -25,7 +25,7 @@
 
 #include "device_definition.h"
 #include "platform_base_address.h"
-#include "tfm_plat_defs.h"
+// #include "tfm_plat_defs.h"
 
 /* UART CMSDK driver structures */
 #ifdef UART0_CMSDK_S
@@ -343,16 +343,16 @@ struct ppc_sse200_dev_t APB_PPCEXP2_DEV_S = {
 
 /* CMSDK Timer driver structures */
 #ifdef CMSDK_TIMER0_S
-static const struct timer_cmsdk_dev_cfg_t CMSDK_TIMER0_DEV_CFG_S
-    TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_IRQ_TEST_1", "APP-ROT") = {
+static const struct timer_cmsdk_dev_cfg_t CMSDK_TIMER0_DEV_CFG_S = {
+    // TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_IRQ_TEST_1", "APP-ROT") = {
         .base = CMSDK_TIMER0_BASE_S
     };
-static struct timer_cmsdk_dev_data_t CMSDK_TIMER0_DEV_DATA_S
-    TFM_LINK_SET_RW_IN_PARTITION_SECTION("TFM_IRQ_TEST_1", "APP-ROT") = {
+static struct timer_cmsdk_dev_data_t CMSDK_TIMER0_DEV_DATA_S = {
+    // TFM_LINK_SET_RW_IN_PARTITION_SECTION("TFM_IRQ_TEST_1", "APP-ROT") = {
         .is_initialized = 0
     };
-struct timer_cmsdk_dev_t CMSDK_TIMER0_DEV_S
-    TFM_LINK_SET_RW_IN_PARTITION_SECTION("TFM_IRQ_TEST_1", "APP-ROT") = {
+struct timer_cmsdk_dev_t CMSDK_TIMER0_DEV_S = {
+    // TFM_LINK_SET_RW_IN_PARTITION_SECTION("TFM_IRQ_TEST_1", "APP-ROT") = {
         &(CMSDK_TIMER0_DEV_CFG_S),
         &(CMSDK_TIMER0_DEV_DATA_S)
     };