projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sun6i: cpu_reset: Do not return from cpu_reset()
[oweals/u-boot.git]
/
arch
/
arm
/
cpu
/
armv7
/
am33xx
/
board.c
diff --git
a/arch/arm/cpu/armv7/am33xx/board.c
b/arch/arm/cpu/armv7/am33xx/board.c
index 81477aa7b0c3fc9e432a248ca632fc0672a693db..67bef23ea90592f93cf176c6cadb3963c04ab8e1 100644
(file)
--- a/
arch/arm/cpu/armv7/am33xx/board.c
+++ b/
arch/arm/cpu/armv7/am33xx/board.c
@@
-275,6
+275,14
@@
static void watchdog_disable(void)
;
}
;
}
+#ifdef CONFIG_SPL_BUILD
+void board_init_f(ulong dummy)
+{
+ board_early_init_f();
+ sdram_init();
+}
+#endif
+
void s_init(void)
{
/*
void s_init(void)
{
/*
@@
-290,6
+298,7
@@
void s_init(void)
setup_clocks_for_console();
uart_soft_reset();
#if defined(CONFIG_NOR_BOOT) || defined(CONFIG_QSPI_BOOT)
setup_clocks_for_console();
uart_soft_reset();
#if defined(CONFIG_NOR_BOOT) || defined(CONFIG_QSPI_BOOT)
+ /* TODO: This does not work, gd is not available yet */
gd->baudrate = CONFIG_BAUDRATE;
serial_init();
gd->have_console = 1;
gd->baudrate = CONFIG_BAUDRATE;
serial_init();
gd->have_console = 1;
@@
-298,9
+307,5
@@
void s_init(void)
/* Enable RTC32K clock */
rtc32k_enable();
#endif
/* Enable RTC32K clock */
rtc32k_enable();
#endif
-#ifdef CONFIG_SPL_BUILD
- board_early_init_f();
- sdram_init();
-#endif
}
#endif
}
#endif