Skip to content
Snippets Groups Projects
Commit 033a05eb authored by Yann Gautier's avatar Yann Gautier Committed by Sebastien Pasdeloup
Browse files

stm32mp1: remove STM32MP_UART_PROGRAMMER flag usage in BL32

STM32MP_UART_PROGRAMMER is no more used when compiling BL32 (SP_min).
The boot interface should then be unconditionally checked when setting
the UART console.
This adds 160 bytes of code.

Change-Id: I54dfa85ea1cb3c6e74a6dc35f13730f26bc904f0
Reviewed-on: https://gerrit.st.com/c/mpu/oe/st/tf-a/+/188320


Reviewed-by: default avatarCITOOLS <smet-aci-reviews@lists.codex.cro.st.com>
Reviewed-by: default avatarLionel DEBIEVE <lionel.debieve@st.com>
Reviewed-by: default avatarCIBUILD <smet-aci-builds@lists.codex.cro.st.com>
Reviewed-by: default avatarYann GAUTIER <yann.gautier@st.com>
Tested-by: default avatarYann GAUTIER <yann.gautier@st.com>
parent 47127c78
No related branches found
No related tags found
No related merge requests found
......@@ -66,7 +66,7 @@ uint32_t stm32_iwdg_get_otp_config(uint32_t iwdg_inst);
uint32_t stm32_iwdg_shadow_update(uint32_t iwdg_inst, uint32_t flags);
#endif
#if STM32MP_UART_PROGRAMMER
#if STM32MP_UART_PROGRAMMER || defined(IMAGE_BL32)
/* Get the UART address from its instance number */
uintptr_t get_uart_address(uint32_t instance_nb);
#endif
......
......@@ -363,24 +363,20 @@ static void setup_uart_console(void)
struct dt_node_info dt_uart_info;
unsigned int console_flags;
int result;
#if STM32MP_UART_PROGRAMMER
uint32_t boot_itf;
uint32_t boot_instance;
#endif
result = dt_get_stdout_uart_info(&dt_uart_info);
if ((result <= 0) || (dt_uart_info.status == DT_DISABLED)) {
return;
}
#if STM32MP_UART_PROGRAMMER
stm32_get_boot_interface(&boot_itf, &boot_instance);
if ((boot_itf == BOOT_API_CTX_BOOT_INTERFACE_SEL_SERIAL_UART) &&
(get_uart_address(boot_instance) == dt_uart_info.base)) {
return;
}
#endif
if (console_stm32_register(dt_uart_info.base, 0,
STM32MP_UART_BAUDRATE, &console) == 0U) {
......
......@@ -287,7 +287,7 @@ uint32_t stm32_get_gpio_bank_offset(unsigned int bank)
return bank * GPIO_BANK_OFFSET;
}
#if STM32MP_UART_PROGRAMMER
#if STM32MP_UART_PROGRAMMER || defined(IMAGE_BL32)
/*
* UART Management
*/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment