LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

board: stm32mp1: move the function board_debug_uart_init in spl.c 

Move the debug function board_debug_uart_init in spl.c
as the debug_uart_init() function is called in arch_cpu_init()
only for SPL and remove the board.c file.

For TFABOOT, the UART TX pin configuration is done in TF-A.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>
This commit is contained in:
Patrick Delaunay 2020-05-25 12:19:49 +02:00
parent 4a87fea6de
commit 4fb46816c7
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/st/stm32mp1/Makefile
View File

@ -8,5 +8,3 @@ obj-y += spl.o
else else
obj-y += stm32mp1.o obj-y += stm32mp1.o
endif endif
obj-y += board.o

28
board/st/stm32mp1/spl.c
View File

@ -6,7 +6,10 @@
#include <config.h> #include <config.h>
#include <common.h> #include <common.h>
#include <init.h> #include <init.h>
#include <asm/io.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include "../common/stpmic1.h" #include "../common/stpmic1.h"
/* board early initialisation in board_f: need to use global variable */ /* board early initialisation in board_f: need to use global variable */
@ -25,3 +28,28 @@ int board_early_init_f(void)
return 0; return 0;
} }
#ifdef CONFIG_DEBUG_UART_BOARD_INIT
void board_debug_uart_init(void)
{
#if (CONFIG_DEBUG_UART_BASE == STM32_UART4_BASE)
#define RCC_MP_APB1ENSETR (STM32_RCC_BASE + 0x0A00)
#define RCC_MP_AHB4ENSETR (STM32_RCC_BASE + 0x0A28)
/* UART4 clock enable */
setbits_le32(RCC_MP_APB1ENSETR, BIT(16));
#define GPIOG_BASE 0x50008000
/* GPIOG clock enable */
writel(BIT(6), RCC_MP_AHB4ENSETR);
/* GPIO configuration for ST boards: Uart4 TX = G11 */
writel(0xffbfffff, GPIOG_BASE + 0x00);
writel(0x00006000, GPIOG_BASE + 0x24);
#else
#error("CONFIG_DEBUG_UART_BASE: not supported value")
#endif
}
#endif