i.MX6: crm_regs: define IOMUXC_GPR4/6/7

[u-boot] / board / esd / common / cmd_loadpci.c

diff --git a/board/esd/common/cmd_loadpci.c b/board/esd/common/cmd_loadpci.c
index c779f793d8ac5abe12a9ada0663cef8d2f485b69..8fcae63f232f40d96f4f814d5fbe6e531391cdac 100644 (file)
--- a/board/esd/common/cmd_loadpci.c
+++ b/board/esd/common/cmd_loadpci.c
@@ -29,7 +29,6 @@
 
 #if defined(CONFIG_CMD_BSP)
 
-extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
 extern int do_source (cmd_tbl_t *, int, int, char *[]);
 
 #define ADDRMASK 0xfffff000
@@ -37,7 +36,7 @@ extern int do_source (cmd_tbl_t *, int, int, char *[]);
 /*
  * 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[])
 {
        u32 *ptr = 0;
        int count = 0;
@@ -48,7 +47,7 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        u32 la, ptm1la;
 
 #if defined(CONFIG_440)
-       ptm1la = in32r(PCIX0_PTM1LA);
+       ptm1la = in32r(PCIL0_PTM1LA);
 #else
        ptm1la = in32r(PTM1LA);
 #endif
@@ -111,7 +110,7 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                         * Call run_cmd
                         */
                        printf("running command at addr 0x%s ...\n", addr);
-                       run_command((char*)la, 0);
+                       run_command((char *)la, 0);
                        break;
 
                default:
@@ -124,7 +123,7 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 U_BOOT_CMD(
        loadpci,        1,      1,      do_loadpci,
        "Wait for pci bootcmd and boot it",
-       NULL
-       );
+       ""
+);
 
 #endif