Platform: Remove hardcoded UART baud rate from init
Use the macro DEFAULT_UART_BAUDRATE in stdio_init to set UART baud rate
instead of the hardcoded value 115200.
Change-Id: Id33014f02b39b67f74321e71f082f3a707986e99
Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>
diff --git a/platform/ext/common/uart_stdout.c b/platform/ext/common/uart_stdout.c
index a8bfe58..48ebe81 100644
--- a/platform/ext/common/uart_stdout.c
+++ b/platform/ext/common/uart_stdout.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2018 ARM Limited
+ * Copyright (c) 2017-2019 ARM Limited
*
* Licensed under the Apace License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
#include <string.h>
#include "Driver_USART.h"
#include "target_cfg.h"
+#include "device_cfg.h"
#define ASSERT_HIGH(X) assert(X == ARM_DRIVER_OK)
@@ -82,7 +83,8 @@
ret = TFM_DRIVER_STDIO.Initialize(NULL);
ASSERT_HIGH(ret);
- ret = TFM_DRIVER_STDIO.Control(ARM_USART_MODE_ASYNCHRONOUS, 115200);
+ ret = TFM_DRIVER_STDIO.Control(ARM_USART_MODE_ASYNCHRONOUS,
+ DEFAULT_UART_BAUDRATE);
ASSERT_HIGH(ret);
}
diff --git a/platform/ext/target/mps2/an519/device_cfg.h b/platform/ext/target/mps2/an519/device_cfg.h
index d4b68bd..2a0f944 100644
--- a/platform/ext/target/mps2/an519/device_cfg.h
+++ b/platform/ext/target/mps2/an519/device_cfg.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2018 ARM Limited
+ * Copyright (c) 2016-2019 ARM Limited
*
* Licensed under the Apache License Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
#define APB_PPCEXP2_S
/* ARM UART */
-#define DEFAULT_UART_BAUDRATE 9600
+#define DEFAULT_UART_BAUDRATE 115200
#define ARM_UART0_S
#define ARM_UART0_NS
#define ARM_UART1_S
diff --git a/platform/ext/target/mps2/an521/device_cfg.h b/platform/ext/target/mps2/an521/device_cfg.h
index d4b68bd..2a0f944 100644
--- a/platform/ext/target/mps2/an521/device_cfg.h
+++ b/platform/ext/target/mps2/an521/device_cfg.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2018 ARM Limited
+ * Copyright (c) 2016-2019 ARM Limited
*
* Licensed under the Apache License Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@
#define APB_PPCEXP2_S
/* ARM UART */
-#define DEFAULT_UART_BAUDRATE 9600
+#define DEFAULT_UART_BAUDRATE 115200
#define ARM_UART0_S
#define ARM_UART0_NS
#define ARM_UART1_S
diff --git a/platform/ext/target/mps2/an539/device/config/device_cfg.h b/platform/ext/target/mps2/an539/device/config/device_cfg.h
index 1537fe6..fd6f844 100644
--- a/platform/ext/target/mps2/an539/device/config/device_cfg.h
+++ b/platform/ext/target/mps2/an539/device/config/device_cfg.h
@@ -39,7 +39,7 @@
#define PPC_SSE123_APB_EXP3_S
/* ARM UART CMSDK */
-#define DEFAULT_UART_BAUDRATE 115200
+#define DEFAULT_UART_BAUDRATE 115200
#define UART0_CMSDK_S
#define UART0_CMSDK_NS
diff --git a/platform/ext/target/musca_a/Device/Config/device_cfg.h b/platform/ext/target/musca_a/Device/Config/device_cfg.h
index 3520f10..30aaa8f 100644
--- a/platform/ext/target/musca_a/Device/Config/device_cfg.h
+++ b/platform/ext/target/musca_a/Device/Config/device_cfg.h
@@ -76,6 +76,6 @@
#define MT25QL_NS
/* Default UART baud rate */
-#define UART_DEFAULT_BAUD_RATE 115200
+#define DEFAULT_UART_BAUDRATE 115200
#endif /* __ARM_LTD_DEVICE_CFG_H__ */
diff --git a/platform/ext/target/musca_a/Device/Source/device_definition.c b/platform/ext/target/musca_a/Device/Source/device_definition.c
index f65425b..5a9f3da 100644
--- a/platform/ext/target/musca_a/Device/Source/device_definition.c
+++ b/platform/ext/target/musca_a/Device/Source/device_definition.c
@@ -495,7 +495,7 @@
#ifdef UART0_PL011_S
static const struct uart_pl011_dev_cfg_t UART0_PL011_DEV_CFG_S = {
.base = MUSCA_UART0_S_BASE,
- .def_baudrate = UART_DEFAULT_BAUD_RATE,
+ .def_baudrate = DEFAULT_UART_BAUDRATE,
.def_wlen = UART_PL011_WLEN_8,
.def_parity = UART_PL011_PARITY_DISABLED,
.def_stopbit = UART_PL011_STOPBIT_1};
@@ -510,7 +510,7 @@
#ifdef UART0_PL011_NS
static const struct uart_pl011_dev_cfg_t UART0_PL011_DEV_CFG_NS = {
.base = MUSCA_UART0_NS_BASE,
- .def_baudrate = UART_DEFAULT_BAUD_RATE,
+ .def_baudrate = DEFAULT_UART_BAUDRATE,
.def_wlen = UART_PL011_WLEN_8,
.def_parity = UART_PL011_PARITY_DISABLED,
.def_stopbit = UART_PL011_STOPBIT_1};
@@ -525,7 +525,7 @@
#ifdef UART1_PL011_S
static const struct uart_pl011_dev_cfg_t UART1_PL011_DEV_CFG_S = {
.base = MUSCA_UART1_S_BASE,
- .def_baudrate = UART_DEFAULT_BAUD_RATE,
+ .def_baudrate = DEFAULT_UART_BAUDRATE,
.def_wlen = UART_PL011_WLEN_8,
.def_parity = UART_PL011_PARITY_DISABLED,
.def_stopbit = UART_PL011_STOPBIT_1};
@@ -540,7 +540,7 @@
#ifdef UART1_PL011_NS
static const struct uart_pl011_dev_cfg_t UART1_PL011_DEV_CFG_NS = {
.base = MUSCA_UART1_NS_BASE,
- .def_baudrate = UART_DEFAULT_BAUD_RATE,
+ .def_baudrate = DEFAULT_UART_BAUDRATE,
.def_wlen = UART_PL011_WLEN_8,
.def_parity = UART_PL011_PARITY_DISABLED,
.def_stopbit = UART_PL011_STOPBIT_1};
diff --git a/platform/ext/target/musca_b1/Device/Config/device_cfg.h b/platform/ext/target/musca_b1/Device/Config/device_cfg.h
index 8b8cdff..506c545 100644
--- a/platform/ext/target/musca_b1/Device/Config/device_cfg.h
+++ b/platform/ext/target/musca_b1/Device/Config/device_cfg.h
@@ -67,6 +67,6 @@
#define CMSDK_TIMER1_NS
/* Default UART baud rate */
-#define UART_DEFAULT_BAUD_RATE 115200
+#define DEFAULT_UART_BAUDRATE 115200
#endif /* __MUSCA_B1_DEVICE_CFG_H__ */
diff --git a/platform/ext/target/musca_b1/Device/Source/device_definition.c b/platform/ext/target/musca_b1/Device/Source/device_definition.c
index c392f1c..56f8018 100644
--- a/platform/ext/target/musca_b1/Device/Source/device_definition.c
+++ b/platform/ext/target/musca_b1/Device/Source/device_definition.c
@@ -312,7 +312,7 @@
#ifdef UART0_PL011_S
static const struct uart_pl011_dev_cfg_t UART0_PL011_DEV_CFG_S = {
.base = MUSCA_B1_UART0_S_BASE,
- .def_baudrate = UART_DEFAULT_BAUD_RATE,
+ .def_baudrate = DEFAULT_UART_BAUDRATE,
.def_wlen = UART_PL011_WLEN_8,
.def_parity = UART_PL011_PARITY_DISABLED,
.def_stopbit = UART_PL011_STOPBIT_1};
@@ -326,7 +326,7 @@
#ifdef UART0_PL011_NS
static const struct uart_pl011_dev_cfg_t UART0_PL011_DEV_CFG_NS = {
.base = MUSCA_B1_UART0_NS_BASE,
- .def_baudrate = UART_DEFAULT_BAUD_RATE,
+ .def_baudrate = DEFAULT_UART_BAUDRATE,
.def_wlen = UART_PL011_WLEN_8,
.def_parity = UART_PL011_PARITY_DISABLED,
.def_stopbit = UART_PL011_STOPBIT_1};
@@ -341,7 +341,7 @@
#ifdef UART1_PL011_S
static const struct uart_pl011_dev_cfg_t UART1_PL011_DEV_CFG_S = {
.base = MUSCA_B1_UART1_S_BASE,
- .def_baudrate = UART_DEFAULT_BAUD_RATE,
+ .def_baudrate = DEFAULT_UART_BAUDRATE,
.def_wlen = UART_PL011_WLEN_8,
.def_parity = UART_PL011_PARITY_DISABLED,
.def_stopbit = UART_PL011_STOPBIT_1};
@@ -355,7 +355,7 @@
#ifdef UART1_PL011_NS
static const struct uart_pl011_dev_cfg_t UART1_PL011_DEV_CFG_NS = {
.base = MUSCA_B1_UART1_NS_BASE,
- .def_baudrate = UART_DEFAULT_BAUD_RATE,
+ .def_baudrate = DEFAULT_UART_BAUDRATE,
.def_wlen = UART_PL011_WLEN_8,
.def_parity = UART_PL011_PARITY_DISABLED,
.def_stopbit = UART_PL011_STOPBIT_1};