Merge git://git.denx.de/u-boot-fsl-qoriq

[people/ms/u-boot.git] / examples / standalone / mem_to_mem_idma2intr.c

diff --git a/examples/standalone/mem_to_mem_idma2intr.c b/examples/standalone/mem_to_mem_idma2intr.c
index e466c904a7866235dae68f5e5c780085501b4e15..ce6e6c4a1071aa6b68c4dee7a9b323aefb30c42b 100644 (file)
--- a/examples/standalone/mem_to_mem_idma2intr.c
+++ b/examples/standalone/mem_to_mem_idma2intr.c
@@ -28,6 +28,7 @@
 
 
 #include <common.h>
+#include <console.h>
 #include <exports.h>
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -185,13 +186,6 @@ int ctrlc (void)
        }
        return 0;
 }
-void * memset(void * s,int c,size_t count)
-{
-       char *xs = (char *) s;
-       while (count--)
-               *xs++ = c;
-       return s;
-}
 int memcmp(const void * cs,const void * ct,size_t count)
 {
        const unsigned char *su1, *su2;
@@ -309,7 +303,8 @@ int idma_init (void)
 
        memaddr = dpalloc (sizeof (pram_idma_t), 64);
 
-       *(volatile ushort *) &immap->im_dprambase[PROFF_IDMA2_BASE] = memaddr;
+       *(volatile u16 *)&immap->im_dprambase16
+               [PROFF_IDMA2_BASE / sizeof(u16)] = memaddr;
        piptr = (volatile pram_idma_t *) ((uint) (immap) + memaddr);
 
        piptr->pi_resv1 = 0;            /* manual says: clear it */