Merge with /home/wd/git/u-boot/custodian/u-boot-testing

[oweals/u-boot.git] / board / oxc / oxc.c

diff --git a/board/oxc/oxc.c b/board/oxc/oxc.c
index 8ac0e79a0212b282eab3d2b920de2101c9f18021..6cc3cc5a3e48e7e45da7404541a150b82d1598db 100644 (file)
--- a/board/oxc/oxc.c
+++ b/board/oxc/oxc.c
@@ -26,6 +26,8 @@
 #include <pci.h>
 #include <i2c.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 int checkboard (void)
 {
        puts (  "Board: OXC8240\n" );
@@ -87,7 +89,7 @@ void pci_init_board (void)
        pci_mpc824x_init(&hose);
 }
 
-int board_pre_init (void)
+int board_early_init_f (void)
 {
        *(volatile unsigned char *)(CFG_CPLD_RESET) = 0x89;
        return 0;
@@ -184,8 +186,6 @@ int misc_init_r (void)
 
 #ifdef CFG_OXC_GENERATE_IP
        {
-               DECLARE_GLOBAL_DATA_PTR;
-
                char str[32];
                unsigned long ip = CFG_OXC_IPMASK;
                bd_t *bd = gd->bd;