imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

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

diff --git a/board/evb64260/zuma_pbb.c b/board/evb64260/zuma_pbb.c
index d64025afd74803a8911c6999b1e654df6ba53f56..cab4fcae1748e323d11517e0a4f186584831d3a5 100755 (executable)
--- a/board/evb64260/zuma_pbb.c
+++ b/board/evb64260/zuma_pbb.c
@@ -1,7 +1,7 @@
 #include <common.h>
 #include <malloc.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_BSP)
+#if defined(CONFIG_CMD_BSP)
 #include <command.h>
 #endif
 
@@ -149,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");
@@ -166,7 +168,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;
@@ -200,21 +202,19 @@ do_zuma_init_mbox (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 U_BOOT_CMD(
        zinit,   1,      0,      do_zuma_init_pbb,
-       "zinit   - init zuma pbb\n",
+       "init zuma pbb",
        "\n"
-       "    - init zuma pbb\n"
 );
 U_BOOT_CMD(
        zdtest,   3,      1,      do_zuma_test_dma,
-       "zdtest  - run dma test\n",
+       "run dma test",
        "[cmd [count]]\n"
-       "    - run dma cmd (w=0,v=1,cp=2,cmp=3,wi=4,vi=5), count bytes\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,
-       "zminit  - init zuma mbox\n",
+       "init zuma mbox",
        "\n"
-       "    - init zuma mbox\n"
 );
 
-#endif /* CFG_CMD_BSP */
+#endif