summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYork Sun <york.sun@nxp.com>2016-11-23 14:08:36 -0800
committerYork Sun <york.sun@nxp.com>2016-11-23 23:42:16 -0800
commit4f5554c6e5a457bfd4ba9224f5d362bfdd06ca12 (patch)
tree681cd86160a408bbb2c99f0cc0983acdd5786250
parent51f05ff91408fc992cf7721904e18f8f9a980332 (diff)
powerpc: MPC8641: Remove macro CONFIG_MPC8641
Replace CONFIG_MPC8641 with ARCH_MPC8641 in Kconfig and clean up existing macros. Signed-off-by: York Sun <york.sun@nxp.com>
-rw-r--r--arch/powerpc/cpu/mpc86xx/Kconfig6
-rw-r--r--arch/powerpc/cpu/mpc86xx/Makefile2
-rw-r--r--arch/powerpc/cpu/mpc86xx/cpu.c2
-rw-r--r--arch/powerpc/include/asm/config_mpc86xx.h2
-rw-r--r--arch/powerpc/include/asm/fsl_law.h4
-rw-r--r--include/configs/MPC8641HPCN.h1
-rw-r--r--include/configs/sbc8641d.h1
-rw-r--r--include/configs/xpedite517x.h1
-rw-r--r--scripts/config_whitelist.txt1
9 files changed, 11 insertions, 9 deletions
diff --git a/arch/powerpc/cpu/mpc86xx/Kconfig b/arch/powerpc/cpu/mpc86xx/Kconfig
index c3b3b07c3c1..98fb702e860 100644
--- a/arch/powerpc/cpu/mpc86xx/Kconfig
+++ b/arch/powerpc/cpu/mpc86xx/Kconfig
@@ -10,6 +10,7 @@ choice
config TARGET_SBC8641D
bool "Support sbc8641d"
+ select ARCH_MPC8641
config TARGET_MPC8610HPCD
bool "Support MPC8610HPCD"
@@ -17,15 +18,20 @@ config TARGET_MPC8610HPCD
config TARGET_MPC8641HPCN
bool "Support MPC8641HPCN"
+ select ARCH_MPC8641
config TARGET_XPEDITE517X
bool "Support xpedite517x"
+ select ARCH_MPC8641
endchoice
config ARCH_MPC8610
bool
+config ARCH_MPC8641
+ bool
+
source "board/freescale/mpc8610hpcd/Kconfig"
source "board/freescale/mpc8641hpcn/Kconfig"
source "board/sbc8641d/Kconfig"
diff --git a/arch/powerpc/cpu/mpc86xx/Makefile b/arch/powerpc/cpu/mpc86xx/Makefile
index 0caf9f10128..88c23fc58cf 100644
--- a/arch/powerpc/cpu/mpc86xx/Makefile
+++ b/arch/powerpc/cpu/mpc86xx/Makefile
@@ -20,5 +20,5 @@ obj-$(CONFIG_OF_LIBFDT) += fdt.o
obj-y += interrupts.o
obj-$(CONFIG_MP) += mp.o
obj-$(CONFIG_ARCH_MPC8610) += mpc8610_serdes.o
-obj-$(CONFIG_MPC8641) += mpc8641_serdes.o
+obj-$(CONFIG_ARCH_MPC8641) += mpc8641_serdes.o
obj-y += speed.o
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c
index 4dc483b7d42..7a9570c8ec7 100644
--- a/arch/powerpc/cpu/mpc86xx/cpu.c
+++ b/arch/powerpc/cpu/mpc86xx/cpu.c
@@ -92,7 +92,7 @@ checkcpu(void)
if (get_l2cr() & 0x80000000) {
#if defined(CONFIG_ARCH_MPC8610)
puts("256");
-#elif defined(CONFIG_MPC8641)
+#elif defined(CONFIG_ARCH_MPC8641)
puts("512");
#endif
puts(" KiB enabled\n");
diff --git a/arch/powerpc/include/asm/config_mpc86xx.h b/arch/powerpc/include/asm/config_mpc86xx.h
index 96340affa89..e3d94e3a2b6 100644
--- a/arch/powerpc/include/asm/config_mpc86xx.h
+++ b/arch/powerpc/include/asm/config_mpc86xx.h
@@ -15,7 +15,7 @@
#define CONFIG_MAX_CPUS 1
#define CONFIG_SYS_FSL_NUM_LAWS 10
-#elif defined(CONFIG_MPC8641)
+#elif defined(CONFIG_ARCH_MPC8641)
#define CONFIG_MAX_CPUS 2
#define CONFIG_SYS_FSL_NUM_LAWS 10
diff --git a/arch/powerpc/include/asm/fsl_law.h b/arch/powerpc/include/asm/fsl_law.h
index eee78c8856d..b348cc1f208 100644
--- a/arch/powerpc/include/asm/fsl_law.h
+++ b/arch/powerpc/include/asm/fsl_law.h
@@ -79,7 +79,7 @@ enum law_trgt_if {
enum law_trgt_if {
LAW_TRGT_IF_PCI = 0x00,
LAW_TRGT_IF_PCI_2 = 0x01,
-#ifndef CONFIG_MPC8641
+#ifndef CONFIG_ARCH_MPC8641
LAW_TRGT_IF_PCIE_1 = 0x02,
#endif
#if defined(CONFIG_ARCH_BSC9131) || defined(CONFIG_ARCH_BSC9132)
@@ -117,7 +117,7 @@ enum law_trgt_if {
#define LAW_TRGT_IF_RIO_1 LAW_TRGT_IF_RIO
#define LAW_TRGT_IF_IFC LAW_TRGT_IF_LBC
-#ifdef CONFIG_MPC8641
+#ifdef CONFIG_ARCH_MPC8641
#define LAW_TRGT_IF_PCIE_1 LAW_TRGT_IF_PCI
#endif
diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h
index b35bbd4eb88..66f8e963f9f 100644
--- a/include/configs/MPC8641HPCN.h
+++ b/include/configs/MPC8641HPCN.h
@@ -17,7 +17,6 @@
#define __CONFIG_H
/* High Level Configuration Options */
-#define CONFIG_MPC8641 1 /* MPC8641 specific */
#define CONFIG_MPC8641HPCN 1 /* MPC8641HPCN board specific */
#define CONFIG_MP 1 /* support multiple processors */
#define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */
diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h
index 361c96c0fb4..2bd89f40fed 100644
--- a/include/configs/sbc8641d.h
+++ b/include/configs/sbc8641d.h
@@ -21,7 +21,6 @@
#define __CONFIG_H
/* High Level Configuration Options */
-#define CONFIG_MPC8641 1 /* MPC8641 specific */
#define CONFIG_SBC8641D 1 /* SBC8641D board specific */
#define CONFIG_MP 1 /* support multiple processors */
#define CONFIG_LINUX_RESET_VEC 0x100 /* Reset vector used by Linux */
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h
index 027440ae938..6d957896e64 100644
--- a/include/configs/xpedite517x.h
+++ b/include/configs/xpedite517x.h
@@ -14,7 +14,6 @@
/*
* High Level Configuration Options
*/
-#define CONFIG_MPC8641 1 /* MPC8641 specific */
#define CONFIG_XPEDITE5140 1 /* MPC8641HPCN board specific */
#define CONFIG_SYS_BOARD_NAME "XPedite5170"
#define CONFIG_SYS_FORM_3U_VPX 1
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 75fe00b7eaf..91654cf9b4a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3147,7 +3147,6 @@ CONFIG_MPC85XX_PCI2
CONFIG_MPC860
CONFIG_MPC860T
CONFIG_MPC862
-CONFIG_MPC8641
CONFIG_MPC8641HPCN
CONFIG_MPC866
CONFIG_MPC866_FAMILY