Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[oweals/u-boot.git] / include / asm-ppc / config.h

diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h
index 9c358aa4135aae4f918639ce0b509080c63d13d0..c9ba805077e3dfeff8754bb38fc55412ae8c0245 100644 (file)
--- a/include/asm-ppc/config.h
+++ b/include/asm-ppc/config.h
@@ -29,9 +29,11 @@
 #endif
 #endif
 
-#ifndef CONFIG_FSL_DMA
-#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER) && \
-       (defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx))
+/* Check if boards need to enable FSL DMA engine for SDRAM init */
+#if !defined(CONFIG_FSL_DMA) && defined(CONFIG_DDR_ECC)
+#if (defined(CONFIG_MPC83xx) && defined(CONFIG_DDR_ECC_INIT_VIA_DMA)) || \
+       ((defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)) && \
+       !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER))
 #define CONFIG_FSL_DMA
 #endif
 #endif