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 ad490c3494cde68d3543058917c2a52ed78f3c04..8fcae63f232f40d96f4f814d5fbe6e531391cdac 100644 (file)
--- a/board/esd/common/cmd_loadpci.c
+++ b/board/esd/common/cmd_loadpci.c
@@ -29,15 +29,14 @@
 
 #if defined(CONFIG_CMD_BSP)
 
-extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
-extern int do_autoscript (cmd_tbl_t *, int, int, char *[]);
+extern int do_source (cmd_tbl_t *, int, int, char *[]);
 
 #define ADDRMASK 0xfffff000
 
 /*
  * 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
@@ -98,12 +97,12 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
                case 1:
                        /*
-                        * Boot image via autoscr
+                        * Boot image via "source" command
                         */
                        printf("executing script at addr 0x%s ...\n", addr);
                        local_args[0] = addr;
                        local_args[1] = NULL;
-                       do_autoscript(cmdtp, 0, 1, local_args);
+                       do_source(cmdtp, 0, 1, local_args);
                        break;
 
                case 2:
@@ -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:
@@ -123,8 +122,8 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        loadpci,        1,      1,      do_loadpci,
-       "loadpci - Wait for pci bootcmd and boot it\n",
-       NULL
-       );
+       "Wait for pci bootcmd and boot it",
+       ""
+);
 
 #endif