ARM: keystone2: Cleanup SoC detection

[u-boot] / arch / arm / mach-uniphier / spl.c

diff --git a/arch/arm/mach-uniphier/spl.c b/arch/arm/mach-uniphier/spl.c
index 8a4eafc266a03dd0ea20092aab7885a5ac91395c..a34d3a167cc57533e432e43ccf3fd8c1f7952f33 100644 (file)
--- a/arch/arm/mach-uniphier/spl.c
+++ b/arch/arm/mach-uniphier/spl.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2013-2015 Panasonic Corporation
- *   Author: Masahiro Yamada <yamada.m@jp.panasonic.com>
+ * Copyright (C) 2015      Socionext Inc.
+ *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -8,8 +9,8 @@
 #include <common.h>
 #include <spl.h>
 #include <linux/compiler.h>
-#include <asm/arch/led.h>
-#include <asm/arch/board.h>
+#include <mach/led.h>
+#include <mach/board.h>
 
 void __weak bcu_init(void)
 {
@@ -18,7 +19,9 @@ void sbc_init(void);
 void sg_init(void);
 void pll_init(void);
 void pin_init(void);
-void clkrst_init(void);
+void memconf_init(void);
+void early_clkrst_init(void);
+void early_pin_init(void);
 int umc_init(void);
 void enable_dpll_ssc(void);
 
@@ -38,10 +41,24 @@ void spl_board_init(void)
 
        led_write(L, 0, , );
 
-       clkrst_init();
+       memconf_init();
 
        led_write(L, 1, , );
 
+       early_clkrst_init();
+
+       led_write(L, 2, , );
+
+       early_pin_init();
+
+       led_write(L, 3, , );
+
+#ifdef CONFIG_SPL_SERIAL_SUPPORT
+       preloader_console_init();
+#endif
+
+       led_write(L, 4, , );
+
        {
                int res;
 
@@ -51,9 +68,9 @@ void spl_board_init(void)
                                ;
                }
        }
-       led_write(L, 2, , );
+       led_write(L, 5, , );
 
        enable_dpll_ssc();
 
-       led_write(L, 3, , );
+       led_write(L, 6, , );
 }