random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-13 20:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

ARM: zynq: Fix debug uart initialization

Browse Source 
The commit 0dba45864b2a ("arm: Init the debug UART") calls
debug_uart_init() from crt0.S but it won't work because SOC is not
configured yet. That's why create board_debug_uart_init() which calls
ps7_init() earlier before the first access to UART.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/18e67e02a0c7190839a1ef3a11f3fd6babcf34cc.1645104518.git.michal.simek@xilinx.com
This commit is contained in:
Michal Simek 2022-02-17 14:28:41 +01:00
parent 83d2941fe9
commit 05f0f269b7
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@ -1157,6 +1157,7 @@ config ARCH_ZYNQ
select CLK select CLK
select CLK_ZYNQ select CLK_ZYNQ
select CPU_V7A select CPU_V7A
select DEBUG_UART_BOARD_INIT if SPL && DEBUG_UART
select DM select DM
select DM_ETH if NET select DM_ETH if NET
select DM_MMC if MMC select DM_MMC if MMC

17
arch/arm/mach-zynq/spl.c
View File

@ -16,17 +16,20 @@
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/arch/ps7_init_gpl.h> #include <asm/arch/ps7_init_gpl.h>
void board_init_f(ulong dummy) #if defined(CONFIG_DEBUG_UART_BOARD_INIT)
void board_debug_uart_init(void)
{ {
ps7_init(); ps7_init();
}
#endif
void board_init_f(ulong dummy)
{
#if !defined(CONFIG_DEBUG_UART_BOARD_INIT)
ps7_init();
#endif
arch_cpu_init(); arch_cpu_init();
#ifdef CONFIG_DEBUG_UART
/* Uart debug for sure */
debug_uart_init();
puts("Debug uart enabled\n"); /* or printch() */
#endif
} }
#ifdef CONFIG_SPL_BOARD_INIT #ifdef CONFIG_SPL_BOARD_INIT

7
board/xilinx/zynq/board.c
View File

@ -25,6 +25,13 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_DEBUG_UART_BOARD_INIT)
void board_debug_uart_init(void)
{
/* Add initialization sequence if UART is not configured */
}
#endif
int board_init(void) int board_init(void)
{ {
if (IS_ENABLED(CONFIG_SPL_BUILD)) if (IS_ENABLED(CONFIG_SPL_BUILD))