Merge with git://www.denx.de/git/u-boot.git

[u-boot] / board / evb64260 / zuma_pbb.c

diff --git a/board/evb64260/zuma_pbb.c b/board/evb64260/zuma_pbb.c
index 10c484576b317766a1e64e10cddd2a54fe0830ca..296e4619c9a31c10692c691f2d24ecd54d257be6 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)
 {
@@ -165,7 +166,7 @@ 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;
@@ -197,4 +198,23 @@ do_zuma_init_mbox (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
        return 0;
 }
 
-#endif /* CFG_CMD_BSP */
+U_BOOT_CMD(
+       zinit,   1,      0,      do_zuma_init_pbb,
+       "zinit   - init zuma pbb\n",
+       "\n"
+       "    - init zuma pbb\n"
+);
+U_BOOT_CMD(
+       zdtest,   3,      1,      do_zuma_test_dma,
+       "zdtest  - run dma test\n",
+       "[cmd [count]]\n"
+       "    - run dma cmd (w=0,v=1,cp=2,cmp=3,wi=4,vi=5), count bytes\n"
+);
+U_BOOT_CMD(
+       zminit,   1,      0,      do_zuma_init_mbox,
+       "zminit  - init zuma mbox\n",
+       "\n"
+       "    - init zuma mbox\n"
+);
+
+#endif