projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rockchip: rk3288-veyron: Migrate "u-boot, boot0" to "u-boot, spl-boot-order"
[oweals/u-boot.git]
/
arch
/
arm
/
mach-zynq
/
spl.c
diff --git
a/arch/arm/mach-zynq/spl.c
b/arch/arm/mach-zynq/spl.c
index 723019d25279b15dedfffac977eb98d9ab37d4f2..9b7c0be951b58be962a237e2ae2c36613e32e8ef 100644
(file)
--- a/
arch/arm/mach-zynq/spl.c
+++ b/
arch/arm/mach-zynq/spl.c
@@
-1,7
+1,6
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
/*
- * (C) Copyright 2014 Xilinx, Inc. Michal Simek
- *
- * SPDX-License-Identifier: GPL-2.0+
+ * (C) Copyright 2014 - 2017 Xilinx, Inc. Michal Simek
*/
#include <common.h>
#include <debug_uart.h>
*/
#include <common.h>
#include <debug_uart.h>
@@
-11,25
+10,28
@@
#include <asm/spl.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
#include <asm/spl.h>
#include <asm/arch/hardware.h>
#include <asm/arch/sys_proto.h>
-
-DECLARE_GLOBAL_DATA_PTR;
+#include <asm/arch/ps7_init_gpl.h>
void board_init_f(ulong dummy)
{
ps7_init();
arch_cpu_init();
void board_init_f(ulong dummy)
{
ps7_init();
arch_cpu_init();
- /*
- * The debug UART can be used from this point:
- * debug_uart_init();
- * printch('x');
- */
+
+#ifdef CONFIG_DEBUG_UART
+ /* Uart debug for sure */
+ debug_uart_init();
+ puts("Debug uart enabled\n"); /* or printch() */
+#endif
}
#ifdef CONFIG_SPL_BOARD_INIT
void spl_board_init(void)
{
preloader_console_init();
}
#ifdef CONFIG_SPL_BOARD_INIT
void spl_board_init(void)
{
preloader_console_init();
+#if defined(CONFIG_ARCH_EARLY_INIT_R) && defined(CONFIG_SPL_FPGA_SUPPORT)
+ arch_early_init_r();
+#endif
board_init();
}
#endif
board_init();
}
#endif
@@
-68,13
+70,6
@@
u32 spl_boot_device(void)
return mode;
}
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)
{
#ifdef CONFIG_SPL_OS_BOOT
int spl_start_uboot(void)
{
@@
-83,10
+78,18
@@
int spl_start_uboot(void)
}
#endif
}
#endif
-
__weak void ps7_ini
t(void)
+
void spl_board_prepare_for_boo
t(void)
{
{
- /*
- * This function is overridden by the one in
- * board/xilinx/zynq/(platform)/ps7_init_gpl.c, if it exists.
- */
+ ps7_post_config();
+ debug("SPL bye\n");
}
}
+
+#ifdef CONFIG_SPL_LOAD_FIT
+int board_fit_config_name_match(const char *name)
+{
+ /* Just empty function now - can't decide what to choose */
+ debug("%s: %s\n", __func__, name);
+
+ return 0;
+}
+#endif