Merge branch 'master' of git://git.denx.de/u-boot-microblaze

[u-boot] / board / Marvell / sheevaplug / sheevaplug.c

diff --git a/board/Marvell/sheevaplug/sheevaplug.c b/board/Marvell/sheevaplug/sheevaplug.c
index 173a7b809df33f9b2072e5d9e43597f30548db9a..688d3086d4d3f3296b82e4e45a464788f2f92619 100644 (file)
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -24,13 +24,14 @@
 
 #include <common.h>
 #include <miiphy.h>
+#include <asm/arch/cpu.h>
 #include <asm/arch/kirkwood.h>
 #include <asm/arch/mpp.h>
 #include "sheevaplug.h"
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int board_init(void)
+int board_early_init_f(void)
 {
        /*
         * default gpio configuration
@@ -95,8 +96,12 @@ int board_init(void)
                MPP49_GPIO,
                0
        };
-       kirkwood_mpp_conf(kwmpp_config);
+       kirkwood_mpp_conf(kwmpp_config, NULL);
+       return 0;
+}
 
+int board_init(void)
+{
        /*
         * arch number of board
         */