diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-09-13 12:09:21 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-09-13 12:09:21 +0000 |
| commit | 42cdeb93080f2b54a75be14e4f5ee776872f3f0f (patch) | |
| tree | efb266d579ee70df877d411f0ccccb0696baf2c8 /plat | |
| parent | e65d3f45d777f086388d13adf2ad8252d60a93a6 (diff) | |
| parent | ebf851ed34eda0a4fcd87a155a13b02f3db8573c (diff) | |
Merge "stm32mp1: manage CONSOLE_FLAG_TRANSLATE_CRLF and cleanup driver" into integration
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/st/stm32mp1/bl2_plat_setup.c | 3 | ||||
| -rw-r--r-- | plat/st/stm32mp1/sp_min/sp_min_setup.c | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/plat/st/stm32mp1/bl2_plat_setup.c b/plat/st/stm32mp1/bl2_plat_setup.c index 75ae372a..c6aefe32 100644 --- a/plat/st/stm32mp1/bl2_plat_setup.c +++ b/plat/st/stm32mp1/bl2_plat_setup.c @@ -272,6 +272,9 @@ void bl2_el3_plat_arch_setup(void) panic(); } + console_set_scope(&console.console, CONSOLE_FLAG_BOOT | + CONSOLE_FLAG_CRASH | CONSOLE_FLAG_TRANSLATE_CRLF); + stm32mp_print_cpuinfo(); board_model = dt_get_board_model(); diff --git a/plat/st/stm32mp1/sp_min/sp_min_setup.c b/plat/st/stm32mp1/sp_min/sp_min_setup.c index 417115b6..e10dfbfc 100644 --- a/plat/st/stm32mp1/sp_min/sp_min_setup.c +++ b/plat/st/stm32mp1/sp_min/sp_min_setup.c @@ -129,16 +129,20 @@ void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1, result = dt_get_stdout_uart_info(&dt_uart_info); if ((result > 0) && (dt_uart_info.status != 0U)) { + unsigned int console_flags; + if (console_stm32_register(dt_uart_info.base, 0, STM32MP_UART_BAUDRATE, &console) == 0) { panic(); } + console_flags = CONSOLE_FLAG_BOOT | CONSOLE_FLAG_CRASH | + CONSOLE_FLAG_TRANSLATE_CRLF; #ifdef DEBUG - console_set_scope(&console.console, - CONSOLE_FLAG_BOOT | CONSOLE_FLAG_RUNTIME); + console_flags |= CONSOLE_FLAG_RUNTIME; #endif + console_set_scope(&console.console, console_flags); } } |