ARM: spl: atmel: move mem_init() advance in SPL init.

[oweals/u-boot.git] / arch / arm / mach-at91 / spl_atmel.c

diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c
index b2fb51d0ac27fbb4c898c0b4fd10145f9e930cab..b75c2ccefdc2a029dec8fceb243b3fb81679fa0a 100644 (file)
--- a/arch/arm/mach-at91/spl_atmel.c
+++ b/arch/arm/mach-at91/spl_atmel.c
@@ -77,8 +77,14 @@ void s_init(void)
 
 void board_init_f(ulong dummy)
 {
+       int ret;
+
        switch_to_main_crystal_osc();
 
+#ifdef CONFIG_SAMA5D2
+       configure_2nd_sram_as_l2_cache();
+#endif
+
        /* disable watchdog */
        at91_disable_wdt();
 
@@ -95,7 +101,14 @@ void board_init_f(ulong dummy)
 
        board_early_init_f();
 
+       mem_init();
+
+       ret = spl_init();
+       if (ret) {
+               debug("spl_init() failed: %d\n", ret);
+               hang();
+       }
+
        preloader_console_init();
 
-       mem_init();
 }