summaryrefslogtreecommitdiff
path: root/arch/powerpc/include/asm/config_mpc85xx.h
diff options
context:
space:
mode:
authorYork Sun <york.sun@nxp.com>2016-11-18 11:44:43 -0800
committerYork Sun <york.sun@nxp.com>2016-11-23 23:42:12 -0800
commit3006ebc37e232e68464cbb196e0de222ebe7b238 (patch)
treec0965ad455b34bd40e67e4f3ad8bfc841f3ff23b /arch/powerpc/include/asm/config_mpc85xx.h
parent45a8d11782934446421970bb8c1da60c57c595a8 (diff)
powerpc: B4860: Remove macro CONFIG_PPC_B4860
Replace CONFIG_PPC_B4860 with ARCH_B4860 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 23ee8f9a0d..5b6dcadaf6 100644
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -611,7 +611,7 @@
#define CONFIG_SYS_FSL_SFP_VER_3_0
#define CONFIG_SYS_FSL_PCI_VER_3_X
-#elif defined(CONFIG_PPC_B4860) || defined(CONFIG_PPC_B4420)
+#elif defined(CONFIG_ARCH_B4860) || defined(CONFIG_PPC_B4420)
#define CONFIG_E6500
#define CONFIG_SYS_PPC64 /* 64-bit core */
#define CONFIG_FSL_CORENET /* Freescale CoreNet platform */
@@ -653,7 +653,7 @@
#define CONFIG_SYS_CCSRBAR_DEFAULT 0xfe000000
#define CONFIG_SYS_FSL_SFP_VER_3_0
-#ifdef CONFIG_PPC_B4860
+#ifdef CONFIG_ARCH_B4860
#define CONFIG_SYS_FSL_CORES_PER_CLUSTER 4
#define CONFIG_MAX_CPUS 4
#define CONFIG_MAX_DSP_CPUS 12