X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fesd%2Fpci405%2Fcmd_pci405.c;h=f570ef340fa91df1e193c37eff808c19f768c5c2;hb=5053b593009a0b5645f32c9b7365c587138e1afd;hp=df91cd4176135dbd1cbccd2fa406073d78aa0c61;hpb=8bde7f776c77b343aca29b8c7b58464d915ac245;p=u-boot

diff --git a/board/esd/pci405/cmd_pci405.c b/board/esd/pci405/cmd_pci405.c
index df91cd4176..f570ef340f 100644
--- a/board/esd/pci405/cmd_pci405.c
+++ b/board/esd/pci405/cmd_pci405.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2002
+ * (C) Copyright 2002-2004
  * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com
  *
  * See file CREDITS for list of people who contributed to this
@@ -27,25 +27,21 @@
 #include <net.h>
 #include <asm/io.h>
 #include <pci.h>
-#include <405gp_pci.h>
+#include <asm/4xx_pci.h>
+#include <asm/processor.h>
 
 #include "pci405.h"
 
-
-#if (CONFIG_COMMANDS & CFG_CMD_BSP)
-
-extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
-
+#if defined(CONFIG_CMD_BSP)
 
 /*
  * Command loadpci: wait for signal from host and boot image.
  */
-int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	unsigned int *ptr = 0;
 	int count = 0;
 	int count2 = 0;
-	int status;
 	int i;
 	char addr[16];
 	char str[] = "\\|/-";
@@ -88,24 +84,28 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 			pci_read_config_dword(PCIDEVID_405GP, i, ptr++);
 		}
 		ptr = (unsigned int *)PCI_REGS_ADDR;
-		*ptr = crc32(0, (char *)PCI_REGS_ADDR+4, PCI_REGS_LEN-4);
+		*ptr = crc32(0, (uchar *)PCI_REGS_ADDR+4, PCI_REGS_LEN-4);
 
 		printf("\nStoring PCI Configuration Regs...\n");
 	} else {
 		sprintf(addr, "%08x", *ptr);
 
 		/*
-		 * Boot image
+		 * Boot image via bootm
 		 */
-		printf("\nBooting image at addr 0x%s ...\n", addr);
+		printf("\nBooting Image at addr 0x%s ...\n", addr);
 		setenv("loadaddr", addr);
 
 		local_args[0] = argv[0];
 		local_args[1] = NULL;
-		status = do_bootm (cmdtp, 0, 1, local_args);
+		do_bootm (cmdtp, 0, 1, local_args);
 	}
 
 	return 0;
 }
-
+U_BOOT_CMD(
+	loadpci,	1,	1,	do_loadpci,
+	"Wait for pci-image and boot it",
+	""
+);
 #endif