ppc/85xx: Clean up immap_85xx.h

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

diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h
index 6d27cb1db34537918dd0a7d885ff40d74b6d0814..e35b0b77fc8b9386697ee2b93958267f713e1bdb 100644 (file)
--- a/include/asm-ppc/config.h
+++ b/include/asm-ppc/config.h
@@ -22,11 +22,29 @@
 #define _ASM_CONFIG_H_
 
 #ifndef CONFIG_MAX_MEM_MAPPED
-#if defined(CONFIG_SDRAM_PPC4xx_IBM_DDR2) && defined(CONFIG_SPD_EEPROM)
+#if defined(CONFIG_4xx) || defined(CONFIG_E500) || defined(CONFIG_MPC86xx)
 #define CONFIG_MAX_MEM_MAPPED  ((phys_size_t)2 << 30)
 #else
-#define CONFIG_MAX_MEM_MAPPED (256 << 20)
+#define CONFIG_MAX_MEM_MAPPED  (256 << 20)
 #endif
 #endif
 
+/* 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
+
+#if defined(CONFIG_MPC8572) || defined(CONFIG_P1020) || \
+       defined(CONFIG_P2020) || defined(CONFIG_MPC8641)
+#define CONFIG_MAX_CPUS                2
+#elif defined(CONFIG_PPC_P4080)
+#define CONFIG_MAX_CPUS                8
+#else
+#define CONFIG_MAX_CPUS                1
+#endif
+
+#endif /* _ASM_CONFIG_H_ */