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 <[email protected]>
---
 board/Marvell/guruplug/guruplug.c               |    6 +++++-
 board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c |    6 +++++-
 board/Marvell/openrd_base/openrd_base.c         |    6 +++++-
 board/Marvell/rd6281a/rd6281a.c                 |    6 +++++-
 board/Marvell/sheevaplug/sheevaplug.c           |    6 +++++-
 include/configs/mv-common.h                     |    1 +
 6 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/board/Marvell/guruplug/guruplug.c 
b/board/Marvell/guruplug/guruplug.c
index 4df4e9b..1f0e67a 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -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
         */
diff --git a/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c 
b/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
index 93d1400..80fd20b 100644
--- a/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
+++ b/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
@@ -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
         */
diff --git a/board/Marvell/openrd_base/openrd_base.c 
b/board/Marvell/openrd_base/openrd_base.c
index d006b2d..10109c1 100644
--- a/board/Marvell/openrd_base/openrd_base.c
+++ b/board/Marvell/openrd_base/openrd_base.c
@@ -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
         */
diff --git a/board/Marvell/rd6281a/rd6281a.c b/board/Marvell/rd6281a/rd6281a.c
index 0d76146..e69e035 100644
--- a/board/Marvell/rd6281a/rd6281a.c
+++ b/board/Marvell/rd6281a/rd6281a.c
@@ -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
         */
diff --git a/board/Marvell/sheevaplug/sheevaplug.c 
b/board/Marvell/sheevaplug/sheevaplug.c
index 173a7b8..d7dc80c 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -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
         */
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index bdcebd3..39f0f08 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -142,6 +142,7 @@
 #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 */
-- 
1.5.3.3

_______________________________________________
U-Boot mailing list
[email protected]
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to