projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configs: ls2088ardb: Correct DEFAULT_DEVICE_TREE value
[oweals/u-boot.git]
/
arch
/
arm
/
mach-rockchip
/
spl.c
diff --git
a/arch/arm/mach-rockchip/spl.c
b/arch/arm/mach-rockchip/spl.c
index cf089c79a7f6a4c7d5a64035e44c3a683009fbff..0b76af6080c921f932e9b94cc2658b01be14c02a 100644
(file)
--- a/
arch/arm/mach-rockchip/spl.c
+++ b/
arch/arm/mach-rockchip/spl.c
@@
-6,6
+6,7
@@
#include <common.h>
#include <debug_uart.h>
#include <dm.h>
#include <common.h>
#include <debug_uart.h>
#include <dm.h>
+#include <hang.h>
#include <ram.h>
#include <spl.h>
#include <asm/arch-rockchip/bootrom.h>
#include <ram.h>
#include <spl.h>
#include <asm/arch-rockchip/bootrom.h>
@@
-57,7
+58,7
@@
u32 spl_boot_device(void)
return boot_device;
}
return boot_device;
}
-u32 spl_boot_mode(const u32 boot_device)
+u32 spl_
mmc_
boot_mode(const u32 boot_device)
{
return MMCSD_MODE_RAW;
}
{
return MMCSD_MODE_RAW;
}
@@
-102,7
+103,7
@@
__weak int arch_cpu_init(void)
void board_init_f(ulong dummy)
{
int ret;
void board_init_f(ulong dummy)
{
int ret;
-#if !defined(CONFIG_
SUPPORT_
TPL) || defined(CONFIG_SPL_OS_BOOT)
+#if !defined(CONFIG_TPL) || defined(CONFIG_SPL_OS_BOOT)
struct udevice *dev;
#endif
struct udevice *dev;
#endif
@@
-134,7
+135,7
@@
void board_init_f(ulong dummy)
/* Init ARM arch timer in arch/arm/cpu/armv7/arch_timer.c */
timer_init();
#endif
/* Init ARM arch timer in arch/arm/cpu/armv7/arch_timer.c */
timer_init();
#endif
-#if !defined(CONFIG_
SUPPORT_
TPL) || defined(CONFIG_SPL_OS_BOOT)
+#if !defined(CONFIG_TPL) || defined(CONFIG_SPL_OS_BOOT)
debug("\nspl:init dram\n");
ret = uclass_get_device(UCLASS_RAM, 0, &dev);
if (ret) {
debug("\nspl:init dram\n");
ret = uclass_get_device(UCLASS_RAM, 0, &dev);
if (ret) {
@@
-146,7
+147,7
@@
void board_init_f(ulong dummy)
}
#ifdef CONFIG_SPL_LOAD_FIT
}
#ifdef CONFIG_SPL_LOAD_FIT
-int board_fit_config_name_match(const char *name)
+int
__weak
board_fit_config_name_match(const char *name)
{
/* Just empty function now - can't decide what to choose */
debug("%s: %s\n", __func__, name);
{
/* Just empty function now - can't decide what to choose */
debug("%s: %s\n", __func__, name);