ARM: UniPhier: consolidate MEMCONF setting code

[karo-tx-uboot.git] / arch / arm / mach-uniphier / spl.c

diff --git a/arch/arm/mach-uniphier/spl.c b/arch/arm/mach-uniphier/spl.c
index c8a2469f6a9d2bbb73bdbe0cd46b14de95ac4e37..c3d90d03d09f44194f5eb40b0089f178a01ab087 100644 (file)
--- a/arch/arm/mach-uniphier/spl.c
+++ b/arch/arm/mach-uniphier/spl.c
@@ -18,6 +18,7 @@ void sbc_init(void);
 void sg_init(void);
 void pll_init(void);
 void pin_init(void);
+void memconf_init(void);
 void early_clkrst_init(void);
 int umc_init(void);
 void enable_dpll_ssc(void);
@@ -38,10 +39,14 @@ void spl_board_init(void)
 
        led_write(L, 0, , );
 
-       early_clkrst_init();
+       memconf_init();
 
        led_write(L, 1, , );
 
+       early_clkrst_init();
+
+       led_write(L, 2, , );
+
        {
                int res;
 
@@ -51,9 +56,9 @@ void spl_board_init(void)
                                ;
                }
        }
-       led_write(L, 2, , );
+       led_write(L, 3, , );
 
        enable_dpll_ssc();
 
-       led_write(L, 3, , );
+       led_write(L, 4, , );
 }