ARM: uniphier: allow to disable CONFIG_MICRO_SUPPORT_CARD

[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 a34d3a167cc57533e432e43ccf3fd8c1f7952f33..4c3cad3b88baf0fd40a7ca5f0d88175eae138760 100644 (file)
--- a/arch/arm/mach-uniphier/spl.c
+++ b/arch/arm/mach-uniphier/spl.c
@@ -1,7 +1,5 @@
 /*
- * Copyright (C) 2013-2015 Panasonic Corporation
- * Copyright (C) 2015      Socionext Inc.
- *   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
+ * Copyright (C) 2013-2015 Masahiro Yamada <yamada.masahiro@socionext.com>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
@@ -9,12 +7,24 @@
 #include <common.h>
 #include <spl.h>
 #include <linux/compiler.h>
-#include <mach/led.h>
-#include <mach/board.h>
+#include <mach/micro-support-card.h>
 
 void __weak bcu_init(void)
 {
 };
+
+void __weak sbc_init(void)
+{
+};
+
+void __weak sg_init(void)
+{
+};
+
+void __weak early_pin_init(void)
+{
+};
+
 void sbc_init(void);
 void sg_init(void);
 void pll_init(void);
@@ -33,31 +43,31 @@ void spl_board_init(void)
 
        sg_init();
 
-       uniphier_board_reset();
+       support_card_reset();
 
        pll_init();
 
-       uniphier_board_init();
+       support_card_init();
 
-       led_write(L, 0, , );
+       led_puts("L0");
 
        memconf_init();
 
-       led_write(L, 1, , );
+       led_puts("L1");
 
        early_clkrst_init();
 
-       led_write(L, 2, , );
+       led_puts("L2");
 
        early_pin_init();
 
-       led_write(L, 3, , );
+       led_puts("L3");
 
 #ifdef CONFIG_SPL_SERIAL_SUPPORT
        preloader_console_init();
 #endif
 
-       led_write(L, 4, , );
+       led_puts("L4");
 
        {
                int res;
@@ -68,9 +78,10 @@ void spl_board_init(void)
                                ;
                }
        }
-       led_write(L, 5, , );
+
+       led_puts("L5");
 
        enable_dpll_ssc();
 
-       led_write(L, 6, , );
+       led_puts("L6");
 }