mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-30 03:12:07 +00:00
5fa030b9f0
We should not init the console this early since it precludes using driver model for the UART, since it is not set up at the start of board_init_f(). See the README for more information. The debug UART does not have this restriction. If we want to do early init with the console on it can be done in spl_board_init(). Move the preloader_console_init() call from board_init_f() to board_init_r(). Signed-off-by: Simon Glass <sjg@chromium.org> Tested-by: Masahiro Yamada <yamada.masahiro@socionext.com> Tested-by: Michal Simek <michal.simek@xilinx.com>
90 lines
1.4 KiB
C
90 lines
1.4 KiB
C
/*
|
|
* (C) Copyright 2014 Xilinx, Inc. Michal Simek
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
#include <common.h>
|
|
#include <spl.h>
|
|
|
|
#include <asm/io.h>
|
|
#include <asm/arch/hardware.h>
|
|
#include <asm/spl.h>
|
|
#include <asm/arch/sys_proto.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
void board_init_f(ulong dummy)
|
|
{
|
|
ps7_init();
|
|
|
|
/* Clear the BSS. */
|
|
memset(__bss_start, 0, __bss_end - __bss_start);
|
|
|
|
arch_cpu_init();
|
|
board_init_r(NULL, 0);
|
|
}
|
|
|
|
#ifdef CONFIG_SPL_BOARD_INIT
|
|
void spl_board_init(void)
|
|
{
|
|
preloader_console_init();
|
|
board_init();
|
|
}
|
|
#endif
|
|
|
|
u32 spl_boot_device(void)
|
|
{
|
|
u32 mode;
|
|
|
|
switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) {
|
|
#ifdef CONFIG_SPL_SPI_SUPPORT
|
|
case ZYNQ_BM_QSPI:
|
|
puts("qspi boot\n");
|
|
mode = BOOT_DEVICE_SPI;
|
|
break;
|
|
#endif
|
|
case ZYNQ_BM_NAND:
|
|
mode = BOOT_DEVICE_NAND;
|
|
break;
|
|
case ZYNQ_BM_NOR:
|
|
mode = BOOT_DEVICE_NOR;
|
|
break;
|
|
#ifdef CONFIG_SPL_MMC_SUPPORT
|
|
case ZYNQ_BM_SD:
|
|
puts("mmc boot\n");
|
|
mode = BOOT_DEVICE_MMC1;
|
|
break;
|
|
#endif
|
|
case ZYNQ_BM_JTAG:
|
|
mode = BOOT_DEVICE_RAM;
|
|
break;
|
|
default:
|
|
puts("Unsupported boot mode selected\n");
|
|
hang();
|
|
}
|
|
|
|
return mode;
|
|
}
|
|
|
|
#ifdef CONFIG_SPL_MMC_SUPPORT
|
|
u32 spl_boot_mode(void)
|
|
{
|
|
return MMCSD_MODE_FS;
|
|
}
|
|
#endif
|
|
|
|
#ifdef CONFIG_SPL_OS_BOOT
|
|
int spl_start_uboot(void)
|
|
{
|
|
/* boot linux */
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
__weak void ps7_init(void)
|
|
{
|
|
/*
|
|
* This function is overridden by the one in
|
|
* board/xilinx/zynq/(platform)/ps7_init_gpl.c, if it exists.
|
|
*/
|
|
}
|