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

[oweals/u-boot.git] / board / esd / cpci750 / cpci750.c

diff --git a/board/esd/cpci750/cpci750.c b/board/esd/cpci750/cpci750.c
index f9f7c7fdf15a54780a4465a106661697965b5593..98051fb3fbe426985b2a0c2e8ab1a318135d84c5 100644 (file)
--- a/board/esd/cpci750/cpci750.c
+++ b/board/esd/cpci750/cpci750.c
@@ -122,7 +122,6 @@ static char show_config_tab[][15] = {{"PCI0DLL_2     "},  /* 31 */
 
 extern flash_info_t flash_info[];
 
-extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
 extern int do_bootvx (cmd_tbl_t *, int, int, char *[]);
 
 /* ------------------------------------------------------------------------- */
@@ -567,7 +566,7 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        volatile unsigned int *ptr;
        int count = 0;
        int count2 = 0;
-       int status;
+       int status = 0;
        char addr[16];
        char str[] = "\\|/-";
        char *local_args[2];
@@ -623,7 +622,7 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                break;
        }
 
-       return 0;
+       return status;
 }
 
 U_BOOT_CMD(
@@ -1102,3 +1101,8 @@ U_BOOT_CMD(
        pldver, 1, 1, do_pldver,
        "Show PLD version",
        "Show PLD version)");
+
+int board_eth_init(bd_t *bis)
+{
+       return mv6436x_eth_initialize(bis);
+}