Make sure that argv[] argument pointers are not modified.

[karo-tx-uboot.git] / board / esd / cpci5200 / cpci5200.c

diff --git a/board/esd/cpci5200/cpci5200.c b/board/esd/cpci5200/cpci5200.c
index 2a42e65de0dd9fc4250eff9f2c2569c9aeec6325..abac2175276838b62165e39a7a31872bad5b2486 100644 (file)
--- a/board/esd/cpci5200/cpci5200.c
+++ b/board/esd/cpci5200/cpci5200.c
@@ -81,7 +81,7 @@ static void sdram_start(int hi_addr)
 
 /*
  * ATTENTION: Although partially referenced initdram does NOT make real use
- *            use of CFG_SDRAM_BASE. The code does not work if CFG_SDRAM_BASE
+ *            use of CONFIG_SYS_SDRAM_BASE. The code does not work if CONFIG_SYS_SDRAM_BASE
  *            is something else than 0x00000000.
  */
 
@@ -106,9 +106,9 @@ phys_size_t initdram(int board_type)
 
        /* find RAM size using SDRAM CS0 only */
        sdram_start(0);
-       test1 = get_ram_size((long *) CFG_SDRAM_BASE, 0x80000000);
+       test1 = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE, 0x80000000);
        sdram_start(1);
-       test2 = get_ram_size((long *) CFG_SDRAM_BASE, 0x80000000);
+       test2 = get_ram_size((long *) CONFIG_SYS_SDRAM_BASE, 0x80000000);
 
        if (test1 > test2) {
                sdram_start(0);
@@ -144,9 +144,9 @@ phys_size_t initdram(int board_type)
 #if 0
        /* find RAM size using SDRAM CS1 only */
        sdram_start(0);
-       get_ram_size((ulong *) (CFG_SDRAM_BASE + dramsize), 0x80000000);
+       get_ram_size((ulong *) (CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
        sdram_start(1);
-       get_ram_size((ulong *) (CFG_SDRAM_BASE + dramsize), 0x80000000);
+       get_ram_size((ulong *) (CONFIG_SYS_SDRAM_BASE + dramsize), 0x80000000);
        sdram_start(0);
 #endif
        /* set SDRAM CS1 size according to the amount of RAM found */
@@ -180,10 +180,10 @@ void flash_afterinit(ulong size)
                /* adjust mapping */
                *(vu_long *) MPC5XXX_BOOTCS_START =
                    *(vu_long *) MPC5XXX_CS0_START =
-                   START_REG(CFG_BOOTCS_START | size);
+                   START_REG(CONFIG_SYS_BOOTCS_START | size);
                *(vu_long *) MPC5XXX_BOOTCS_STOP =
                    *(vu_long *) MPC5XXX_CS0_STOP =
-                   STOP_REG(CFG_BOOTCS_START | size, size);
+                   STOP_REG(CONFIG_SYS_BOOTCS_START | size, size);
        }
 }
 
@@ -265,7 +265,7 @@ int board_eth_init(bd_t *bis)
        return pci_eth_init(bis);
 }
 
-int do_writepci(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
+int do_writepci(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 {
        unsigned int addr;
        unsigned int size;
@@ -294,5 +294,7 @@ int do_writepci(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 }
 
 U_BOOT_CMD(writepci, 3, 1, do_writepci,
-          "writepci- Write some data to pcibus\n",
-          "<addr> <size>\n" "        - Write some data to pcibus.\n");
+          "Write some data to pcibus",
+          "<addr> <size>\n"
+          ""
+);