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>

diff --git a/arch/powerpc/cpu/mpc86xx/Kconfig b/arch/powerpc/cpu/mpc86xx/Kconfig
index c3b3b07c3c11c4e57bbd5495f2b459024b661db9..98fb702e860f2840bebd682b0f1e5efbee3ba97d 100644 (file)
--- 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 0caf9f10128a2b195bfdea43e5599a0eb50b4664..88c23fc58cf1fc601fb72f1718a8a1954bdb8d55 100644 (file)
--- 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 4dc483b7d4227157a8cefd33a5e72494ff5f4ad5..7a9570c8ec72eb4d4dc3f1573f7b4fbcc4113499 100644 (file)
--- 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 96340affa895e2dc67ad8cb1e608b251e6160e83..e3d94e3a2b6b85eb574698c22331d9a86620d261 100644 (file)
--- 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 eee78c8856dc5d7994129e8aa69d564a781216d3..b348cc1f208b463cb2931db2d923f4469516a67d 100644 (file)
--- 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 b35bbd4eb881b3956808560096dffd9408cd6f6d..66f8e963f9fa988319b4db8ea1da5d94e8aa9302 100644 (file)
--- 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 361c96c0fb461d9c3c93ba37de18e0eaa1b8325c..2bd89f40fed42c0e08fa2edf483f615bc71b0568 100644 (file)
--- 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 027440ae9387bcc52952527e018d61432a8778e3..6d957896e64fd87bf8acfa5db8b0c43c4cf52788 100644 (file)
--- 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 75fe00b7eaf8ac6ec94b31716d21a5c47a31ac52..91654cf9b4a5f82cce228cd4005bebeb389cb4dc 100644 (file)
--- 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