]> git.sur5r.net Git - u-boot/commitdiff
Kirkwood: bugfix: broken early console messages
authorPrafulla Wadaskar <prafulla@marvell.com>
Wed, 20 Oct 2010 14:42:27 +0000 (20:12 +0530)
committerPrafulla Wadaskar <prafulla@marvell.com>
Wed, 20 Oct 2010 17:53:01 +0000 (23:23 +0530)
It has been observed that, the complete u-boot banner
does not appear on the console when the system is booted
from NAND/NOR/SPI flash.

This patch fixes this issue on all Marvell boards by adding
board_early_init_f() support

Signed-off-by: Prafulla Wadaskar <prafulla@marvell.com>
board/Marvell/guruplug/guruplug.c
board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
board/Marvell/openrd_base/openrd_base.c
board/Marvell/rd6281a/rd6281a.c
board/Marvell/sheevaplug/sheevaplug.c
include/configs/mv-common.h

index 4df4e9b260482f49caab002473a2ea24713c3219..1f0e67a7fe7c2db8ef619e8e387be76210555750 100644 (file)
@@ -30,7 +30,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int board_init(void)
+int board_early_init_f(void)
 {
        /*
         * default gpio configuration
@@ -96,7 +96,11 @@ int board_init(void)
                0
        };
        kirkwood_mpp_conf(kwmpp_config);
+       return 0;
+}
 
+int board_init(void)
+{
        /*
         * arch number of board
         */
index 93d1400be49d469fbdb04248617cf0523fa44ef9..80fd20b7f4b03027faeb519e13d047133fa79130 100644 (file)
@@ -32,7 +32,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int board_init(void)
+int board_early_init_f(void)
 {
        /*
         * default gpio configuration
@@ -98,7 +98,11 @@ int board_init(void)
                0
        };
        kirkwood_mpp_conf(kwmpp_config);
+       return 0;
+}
 
+int board_init(void)
+{
        /*
         * arch number of board
         */
index d006b2ddf7d3abece1524b7e94b99ed6555fed12..10109c1322a496b241469bb248b68e2337deecff 100644 (file)
@@ -35,7 +35,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int board_init(void)
+int board_early_init_f(void)
 {
        /*
         * default gpio configuration
@@ -102,7 +102,11 @@ int board_init(void)
        };
 
        kirkwood_mpp_conf(kwmpp_config);
+       return 0;
+}
 
+int board_init(void)
+{
        /*
         * arch number of board
         */
index 0d76146b658069e44e54ec98a64057ac9421bf6c..e69e035308bdbcec164e788f14b58968764e6f51 100644 (file)
@@ -31,7 +31,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int board_init(void)
+int board_early_init_f(void)
 {
        /*
         * default gpio configuration
@@ -97,7 +97,11 @@ int board_init(void)
                0
        };
        kirkwood_mpp_conf(kwmpp_config);
+       return 0;
+}
 
+int board_init(void)
+{
        /*
         * arch number of board
         */
index 173a7b809df33f9b2072e5d9e43597f30548db9a..d7dc80c1ba2980792cc1a720ab36c22d7d752422 100644 (file)
@@ -30,7 +30,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int board_init(void)
+int board_early_init_f(void)
 {
        /*
         * default gpio configuration
@@ -96,7 +96,11 @@ int board_init(void)
                0
        };
        kirkwood_mpp_conf(kwmpp_config);
+       return 0;
+}
 
+int board_init(void)
+{
        /*
         * arch number of board
         */
index bdcebd3b5dec128461e114e1a6dc9e3df3993561..2b19a34bb28a6098e3be2c6030bbddda452dc678 100644 (file)
 #define CONFIG_CONSOLE_INFO_QUIET      /* some code reduction */
 #define CONFIG_ARCH_CPU_INIT   /* call arch_cpu_init() */
 #define CONFIG_ARCH_MISC_INIT  /* call arch_misc_init() */
+#define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */ 
 #define CONFIG_DISPLAY_CPUINFO /* Display cpu info */
 #define CONFIG_NR_DRAM_BANKS   4
 #define CONFIG_STACKSIZE       0x00100000      /* regular stack- 1M */