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

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

diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h
index fd7961c040cc6a833dd0f8ad7a7d39d94d6dc59a..af0853b0d7e9fd5f65377992dce354369cbb0a36 100644 (file)
--- a/include/asm-ppc/config.h
+++ b/include/asm-ppc/config.h
@@ -38,11 +38,26 @@
 #endif
 #endif
 
-#if defined(CONFIG_MPC8572) || defined(CONFIG_P2020) \
-       || defined(CONFIG_MPC8641)
-#define CONFIG_MAX_CPUS        2
+#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
+#define CONFIG_MAX_CPUS                1
 #endif
 
+/*
+ * Provide a default boot page translation virtual address that lines up with
+ * Freescale's default e500 reset page.
+ */
+#if (defined(CONFIG_E500) && defined(CONFIG_MP))
+#ifndef CONFIG_BPTR_VIRT_ADDR
+#define CONFIG_BPTR_VIRT_ADDR  0xfffff000
+#endif
+#endif
+
+/* Relocation to SDRAM works on all PPC boards */
+#define CONFIG_RELOC_FIXUP_WORKS
+
 #endif /* _ASM_CONFIG_H_ */