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

[karo-tx-uboot.git] / board / evb64260 / zuma_pbb.c

diff --git a/board/evb64260/zuma_pbb.c b/board/evb64260/zuma_pbb.c
index 10c484576b317766a1e64e10cddd2a54fe0830ca..aa15fa015cfb2016337da093cbd38cbd002689d7 100644 (file)
--- a/board/evb64260/zuma_pbb.c
+++ b/board/evb64260/zuma_pbb.c
@@ -1,9 +1,8 @@
 #include <common.h>
 #include <malloc.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_BSP)
+#if defined(CONFIG_CMD_BSP)
 #include <command.h>
-#include <cmd_bsp.h>
 #endif
 
 #include <pci.h>
@@ -16,9 +15,11 @@
 #define PAT_HI 0x04050607
 
 static PBB_DMA_REG_MAP *zuma_pbb_reg = NULL;
-
 static char test_buf1[2048];
 static char test_buf2[2048];
+void zuma_init_pbb(void);
+int zuma_mbox_init(void);
+int zuma_test_dma(int cmd, int size);
 
 int zuma_test_dma (int cmd, int size)
 {
@@ -148,8 +149,10 @@ void zuma_init_pbb (void)
 
        pci_read_config_dword (dev, PCI_BASE_ADDRESS_0, &iobase);
 
-       zuma_pbb_reg =
-                       (PBB_DMA_REG_MAP *) (iobase & PCI_BASE_ADDRESS_MEM_MASK);
+       iobase &= PCI_BASE_ADDRESS_MEM_MASK;
+
+       zuma_pbb_reg = (PBB_DMA_REG_MAP *)iobase;
+
 
        if (!zuma_pbb_reg) {
                printf ("zuma pbb bar none! (hah hah, get it?)\n");
@@ -165,20 +168,20 @@ void zuma_init_pbb (void)
 
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_BSP)
+#if defined(CONFIG_CMD_BSP)
 
 static int last_cmd = 4;               /* write increment */
 static int last_size = 64;
 
 int
-do_zuma_init_pbb (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_zuma_init_pbb (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        zuma_init_pbb ();
        return 0;
 }
 
 int
-do_zuma_test_dma (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_zuma_test_dma (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        if (argc > 1) {
                last_cmd = simple_strtoul (argv[1], NULL, 10);
@@ -191,10 +194,27 @@ do_zuma_test_dma (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 }
 
 int
-do_zuma_init_mbox (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
+do_zuma_init_mbox (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        zuma_mbox_init ();
        return 0;
 }
 
-#endif /* CFG_CMD_BSP */
+U_BOOT_CMD(
+       zinit,   1,      0,      do_zuma_init_pbb,
+       "init zuma pbb",
+       "\n"
+);
+U_BOOT_CMD(
+       zdtest,   3,      1,      do_zuma_test_dma,
+       "run dma test",
+       "[cmd [count]]\n"
+       "    - run dma cmd (w=0,v=1,cp=2,cmp=3,wi=4,vi=5), count bytes"
+);
+U_BOOT_CMD(
+       zminit,   1,      0,      do_zuma_init_mbox,
+       "init zuma mbox",
+       "\n"
+);
+
+#endif