diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-03-05 16:05:10 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-03-05 16:05:10 +0100 |
| commit | 9b5b60a05cb8bba2d135439419b2030764e359bd (patch) | |
| tree | 15e249ac39e9c547668327218e63a0faf54a3283 /arch/arm/cpu/armv7/am33xx/board.c | |
| parent | 32df39c741788e8637cffe6633d73594b26d70fb (diff) | |
| parent | 7ae8350f67eea861280a4cbd2d067777a0e87153 (diff) | |
| download | talos-obmc-uboot-9b5b60a05cb8bba2d135439419b2030764e359bd.tar.gz talos-obmc-uboot-9b5b60a05cb8bba2d135439419b2030764e359bd.zip | |
Merge branch 'master' of git://git.denx.de/u-boot
Diffstat (limited to 'arch/arm/cpu/armv7/am33xx/board.c')
| -rw-r--r-- | arch/arm/cpu/armv7/am33xx/board.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c index 81477aa7b0..67bef23ea9 100644 --- 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) { /* @@ -290,6 +298,7 @@ void s_init(void) 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; @@ -298,9 +307,5 @@ void s_init(void) /* Enable RTC32K clock */ rtc32k_enable(); #endif -#ifdef CONFIG_SPL_BUILD - board_early_init_f(); - sdram_init(); -#endif } #endif |
