summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/config_mpc85xx.h
diff options
context:
space:
mode:
authorYork Sun <york.sun@nxp.com>2016-11-18 13:36:39 -0800
committerYork Sun <york.sun@nxp.com>2016-11-23 23:42:13 -0800
commit5449c98a2d64de50d16f53401445a4f96356adea (patch)
tree45b599a66e4dffafd6b950420ed5b887d2ea172f /arch/powerpc/include/asm/config_mpc85xx.h
parent6fcddd098543f9cc1c4750fbf957141bbd1abfbe (diff)
powerpc: T1042: Remove macro CONFIG_PPC_T1042
Replace CONFIG_PPC_T1042 with ARCH_T1024 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'arch/powerpc/include/asm/config_mpc85xx.h')
-rw-r--r--arch/powerpc/include/asm/config_mpc85xx.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 7a65caaaca..8efc805b3b 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -679,7 +679,7 @@
#define CONFIG_NUM_DDR_CONTROLLERS 1
#endif
-#elif defined(CONFIG_ARCH_T1040) || defined(CONFIG_PPC_T1042) ||\
+#elif defined(CONFIG_ARCH_T1040) || defined(CONFIG_ARCH_T1042) ||\
defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022)
#define CONFIG_E5500
#define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
@@ -689,7 +689,7 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022)
#ifdef CONFIG_SYS_FSL_DDR4
#define CONFIG_SYS_FSL_DDRC_GEN4
#endif
-#if defined(CONFIG_ARCH_T1040) || defined(CONFIG_PPC_T1042)
+#if defined(CONFIG_ARCH_T1040) || defined(CONFIG_ARCH_T1042)
#define CONFIG_MAX_CPUS 4
#elif defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022)
#define CONFIG_MAX_CPUS 2