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

[u-boot] / board / esd / pci405 / cmd_pci405.c

diff --git a/board/esd/pci405/cmd_pci405.c b/board/esd/pci405/cmd_pci405.c
index 555dc0c23005ba8a014910964e01f9b7a08ef6c1..1d14611293e9c7dbc93abd72e2006f8be3cb2819 100644 (file)
--- 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
@@ -22,21 +22,20 @@
  */
 
 #include <common.h>
+#include <command.h>
 #include <malloc.h>
 #include <net.h>
 #include <asm/io.h>
 #include <pci.h>
-#include <405gp_pci.h>
-#include <cmd_bsp.h>
+#include <asm/4xx_pci.h>
+#include <asm/processor.h>
 
 #include "pci405.h"
 
-
-#if (CONFIG_COMMANDS & CFG_CMD_BSP)
+#if defined(CONFIG_CMD_BSP)
 
 extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
 
-
 /*
  * Command loadpci: wait for signal from host and boot image.
  */
@@ -88,16 +87,16 @@ 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];
@@ -107,5 +106,9 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
        return 0;
 }
-
+U_BOOT_CMD(
+       loadpci,        1,      1,      do_loadpci,
+       "Wait for pci-image and boot it",
+       ""
+);
 #endif