ppc4xx: Fix building of PMC440 board

[u-boot] / board / esd / pmc440 / cmd_pmc440.c

diff --git a/board/esd/pmc440/cmd_pmc440.c b/board/esd/pmc440/cmd_pmc440.c
index 16c9c7eea2e22748c6099202378137f180847522..200d7ee30d3323aa9eb782a2b17a0b0dcdd90080 100644 (file)
--- a/board/esd/pmc440/cmd_pmc440.c
+++ b/board/esd/pmc440/cmd_pmc440.c
@@ -67,7 +67,7 @@ int fpga_interrupt(u32 arg)
        return rc;
 }
 
-int do_waithci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_waithci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        pmc440_fpga_t *fpga = (pmc440_fpga_t *)FPGA_BA;
 
@@ -98,9 +98,9 @@ int do_waithci(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        waithci,        1,      1,      do_waithci,
-       "waithci - Wait for host control interrupt\n",
-       NULL
-       );
+       "Wait for host control interrupt",
+       ""
+);
 
 void dump_fifo(pmc440_fpga_t *fpga, int f, int *n)
 {
@@ -118,7 +118,7 @@ void dump_fifo(pmc440_fpga_t *fpga, int f, int *n)
        }
 }
 
-int do_fifo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_fifo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        pmc440_fpga_t *fpga = (pmc440_fpga_t *)FPGA_BA;
        int i;
@@ -242,7 +242,7 @@ int do_fifo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                                       "address %08x\n",
                                       n, data, f);
                                for (i=0; i<n; i++)
-                                       out32(f, data);
+                                       out_be32((void *)f, data);
                        }
                } else {
                        printf("Usage:\nfifo %s\n", cmdtp->help);
@@ -258,7 +258,7 @@ int do_fifo(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        fifo,   5,      1,      do_fifo,
-       "fifo    - Fifo module operations\n",
+       "Fifo module operations",
        "wait\nfifo read\n"
        "fifo write fifo(0..3) data [cnt=1]\n"
        "fifo write address(>=4) data [cnt=1]\n"
@@ -266,10 +266,10 @@ U_BOOT_CMD(
        "  - with 'wait' argument: interrupt driven read from all fifos\n"
        "  - with 'read' argument: read current contents from all fifos\n"
        "  - with 'write' argument: write 'data' 'cnt' times to "
-       "'fifo' or 'address'\n"
-       );
+       "'fifo' or 'address'"
+);
 
-int do_setup_bootstrap_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_setup_bootstrap_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        ulong sdsdp[5];
        ulong delay;
@@ -336,15 +336,15 @@ int do_setup_bootstrap_eeprom(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]
 }
 U_BOOT_CMD(
        sbe, 4, 0, do_setup_bootstrap_eeprom,
-       "sbe     - setup bootstrap eeprom\n",
+       "setup bootstrap eeprom",
        "<cpufreq:400|533|667> [<console-uart:0|1> [<bringup delay (0..20s)>]]"
-       );
+);
 
 #if defined(CONFIG_PRAM)
 #include <environment.h>
 extern env_t *env_ptr;
 
-int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        u32 pram, nextbase, base;
        char *v;
@@ -399,23 +399,23 @@ int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        painit, 1,      1,      do_painit,
-       "painit  - prepare PciAccess system\n",
-       NULL
-       );
+       "prepare PciAccess system",
+       ""
+);
 #endif /* CONFIG_PRAM */
 
-int do_selfreset(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_selfreset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        in_be32((void*)CONFIG_SYS_RESET_BASE);
        return 0;
 }
 U_BOOT_CMD(
        selfreset,      1,      1,      do_selfreset,
-       "selfreset- assert self-reset# signal\n",
-       NULL
-       );
+       "assert self-reset# signal",
+       ""
+);
 
-int do_resetout(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_resetout(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        pmc440_fpga_t *fpga = (pmc440_fpga_t *)FPGA_BA;
 
@@ -448,11 +448,11 @@ int do_resetout(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        resetout,       2,      1,      do_resetout,
-       "resetout - assert PMC-RESETOUT# signal\n",
-       NULL
-       );
+       "assert PMC-RESETOUT# signal",
+       ""
+);
 
-int do_inta(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_inta(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        if (is_monarch()) {
                printf("This command is only supported in non-monarch mode\n");
@@ -480,12 +480,12 @@ int do_inta(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        inta,   2,      1,      do_inta,
-       "inta    - Assert/Deassert or query INTA# state in non-monarch mode\n",
-       NULL
-       );
+       "Assert/Deassert or query INTA# state in non-monarch mode",
+       ""
+);
 
 /* test-only */
-int do_pmm(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_pmm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        ulong pciaddr;
 
@@ -497,15 +497,15 @@ int do_pmm(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
                /* map PCI address at 0xc0000000 in PLB space */
 
                /* PMM1 Mask/Attribute - disabled b4 setting */
-               out32r(PCIX0_PMM1MA, 0x00000000);
+               out32r(PCIL0_PMM1MA, 0x00000000);
                /* PMM1 Local Address */
-               out32r(PCIX0_PMM1LA, 0xc0000000);
+               out32r(PCIL0_PMM1LA, 0xc0000000);
                /* PMM1 PCI Low Address */
-               out32r(PCIX0_PMM1PCILA, pciaddr);
+               out32r(PCIL0_PMM1PCILA, pciaddr);
                /* PMM1 PCI High Address */
-               out32r(PCIX0_PMM1PCIHA, 0x00000000);
+               out32r(PCIL0_PMM1PCIHA, 0x00000000);
                /* 256MB + No prefetching, and enable region */
-               out32r(PCIX0_PMM1MA, 0xf0000001);
+               out32r(PCIL0_PMM1MA, 0xf0000001);
        } else {
                printf("Usage:\npmm %s\n", cmdtp->help);
        }
@@ -513,12 +513,12 @@ int do_pmm(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 U_BOOT_CMD(
        pmm,    2,      1,      do_pmm,
-       "pmm     - Setup pmm[1] registers\n",
-       "<pciaddr> (pciaddr will be aligned to 256MB)\n"
-       );
+       "Setup pmm[1] registers",
+       "<pciaddr> (pciaddr will be aligned to 256MB)"
+);
 
 #if defined(CONFIG_SYS_EEPROM_WREN)
-int do_eep_wren(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+int do_eep_wren(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int query = argc == 1;
        int state = 0;
@@ -549,8 +549,9 @@ int do_eep_wren(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return state;
 }
 U_BOOT_CMD(eepwren, 2, 0, do_eep_wren,
-          "eepwren - Enable / disable / query EEPROM write access\n",
-          NULL);
+       "Enable / disable / query EEPROM write access",
+       ""
+);
 #endif /* #if defined(CONFIG_SYS_EEPROM_WREN) */
 
 #endif /* CONFIG_CMD_BSP */