Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-27 07:51:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm64: zynqmp: Add support for debug uart also for U-Boot proper

Browse source 
board_early_init_f() is the right location where debug uart can be
configurated (after MIO initialization).
The patch is taking this call from SPL to also make it available for U-Boot
proper.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2020-01-07 09:02:52 +01:00
parent 0486497e2b
commit c0adba5721
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/mach-zynqmp/spl.c
View file

@ -6,7 +6,6 @@
*/ */
#include <common.h> #include <common.h>
#include <debug_uart.h>
#include <init.h> #include <init.h>
#include <spl.h> #include <spl.h>
@ -21,11 +20,6 @@ void board_init_f(ulong dummy)
board_early_init_f(); board_early_init_f();
board_early_init_r(); board_early_init_r();
#ifdef CONFIG_DEBUG_UART
/* Uart debug for sure */
debug_uart_init();
puts("Debug uart enabled\n"); /* or printch() */
#endif
/* Delay is required for clocks to be propagated */ /* Delay is required for clocks to be propagated */
udelay(1000000); udelay(1000000);
} }

15
board/xilinx/zynqmp/zynqmp.c
View file

@ -6,6 +6,7 @@
#include <common.h> #include <common.h>
#include <cpu_func.h> #include <cpu_func.h>
#include <debug_uart.h>
#include <env.h> #include <env.h>
#include <init.h> #include <init.h>
#include <sata.h> #include <sata.h>
@ -319,13 +320,21 @@ static char *zynqmp_get_silicon_idcode_name(void)
int board_early_init_f(void) int board_early_init_f(void)
{ {
int ret = 0;
#if defined(CONFIG_ZYNQMP_PSU_INIT_ENABLED) #if defined(CONFIG_ZYNQMP_PSU_INIT_ENABLED)
int ret;
ret = psu_init(); ret = psu_init();
if (ret)
return ret;
#endif #endif
return ret; #ifdef CONFIG_DEBUG_UART
/* Uart debug for sure */
debug_uart_init();
puts("Debug uart enabled\n"); /* or printch() */
#endif
return 0;
} }
static int multi_boot(void) static int multi_boot(void)