Merge patch series "sysinfo: Expand sysinfo with some more banner information"

[J-u-boot.git] / drivers / dma / fsl_dma.c

diff --git a/drivers/dma/fsl_dma.c b/drivers/dma/fsl_dma.c
index b7eddf0f04c5d377fe47d2d42b92fe396be76144..700df2236bd1a4463f1615a4afc0d78f2f4c728d 100644 (file)
--- a/drivers/dma/fsl_dma.c
+++ b/drivers/dma/fsl_dma.c
@@ -24,9 +24,9 @@
 
 
 #if defined(CONFIG_MPC83xx)
-dma83xx_t *dma_base = (void *)(CONFIG_SYS_MPC83xx_DMA_ADDR);
+dma83xx_t *dma_base = (void *)(CFG_SYS_MPC83xx_DMA_ADDR);
 #elif defined(CONFIG_MPC85xx)
-ccsr_dma_t *dma_base = (void *)(CONFIG_SYS_MPC85xx_DMA_ADDR);
+ccsr_dma_t *dma_base = (void *)(CFG_SYS_MPC85xx_DMA_ADDR);
 #elif defined(CONFIG_MPC86xx)
 ccsr_dma_t *dma_base = (void *)(CONFIG_SYS_MPC86xx_DMA_ADDR);
 #else
@@ -130,12 +130,10 @@ int dmacpy(phys_addr_t dest, phys_addr_t src, phys_size_t count) {
 
 /*
  * 85xx/86xx use dma to initialize SDRAM when !CONFIG_ECC_INIT_VIA_DDRCONTROLLER
- * while 83xx uses dma to initialize SDRAM when CONFIG_DDR_ECC_INIT_VIA_DMA
  */
 #if ((!defined CONFIG_MPC83xx && defined(CONFIG_DDR_ECC) &&    \
-       !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)) ||         \
-       (defined(CONFIG_MPC83xx) && defined(CONFIG_DDR_ECC_INIT_VIA_DMA)))
-void dma_meminit(uint val, uint size)
+       !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)))
+void dma_meminit(uint size)
 {
        uint *p = 0;
        uint i = 0;
@@ -144,7 +142,7 @@ void dma_meminit(uint val, uint size)
                if (((uint)p & 0x1f) == 0)
                        ppcDcbz((ulong)p);
 
-               *p = (uint)CONFIG_MEM_INIT_VALUE;
+               *p = (uint)0xDEADBEEF;
 
                if (((uint)p & 0x1c) == 0x1c)
                        ppcDcbf((ulong)p);