powerpc: MPC8572: Remove macro CONFIG_MPC8572

Replace CONFIG_MPC8572 with ARCH_MPC8572 in Kconfig and clean up existing
macros.

Signed-off-by: York Sun <york.sun@nxp.com>

diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig
index b58ccee68cdf4ae4f3bbba28a295bfab7134dc2d..f4d9f9da040789289c681ded0ae0e74422981877 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -92,6 +92,7 @@ config TARGET_MPC8569MDS
 
 config TARGET_MPC8572DS
        bool "Support MPC8572DS"
+       select ARCH_MPC8572
 
 config TARGET_P1010RDB
        bool "Support P1010RDB"
@@ -174,6 +175,7 @@ config TARGET_XPEDITE520X
 
 config TARGET_XPEDITE537X
        bool "Support xpedite537x"
+       select ARCH_MPC8572
 
 config TARGET_XPEDITE550X
        bool "Support xpedite550x"
@@ -223,6 +225,9 @@ config ARCH_MPC8568
 config ARCH_MPC8569
        bool
 
+config ARCH_MPC8572
+       bool
+
 source "board/freescale/b4860qds/Kconfig"
 source "board/freescale/bsc9131rdb/Kconfig"
 source "board/freescale/bsc9132qds/Kconfig"

diff --git a/arch/powerpc/cpu/mpc85xx/Makefile b/arch/powerpc/cpu/mpc85xx/Makefile
index 9df14349c013ac68ed9264813fb3ee746acf8a66..e3f7dc8c7a410386ef18326e08b8c4f0a6d8d02e 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Makefile
+++ b/arch/powerpc/cpu/mpc85xx/Makefile
@@ -71,7 +71,7 @@ obj-$(CONFIG_ARCH_MPC8544) += mpc8544_serdes.o
 obj-$(CONFIG_ARCH_MPC8548) += mpc8548_serdes.o
 obj-$(CONFIG_ARCH_MPC8568) += mpc8568_serdes.o
 obj-$(CONFIG_ARCH_MPC8569) += mpc8569_serdes.o
-obj-$(CONFIG_MPC8572) += mpc8572_serdes.o
+obj-$(CONFIG_ARCH_MPC8572) += mpc8572_serdes.o
 obj-$(CONFIG_P1010)    += p1010_serdes.o
 obj-$(CONFIG_P1011)    += p1021_serdes.o
 obj-$(CONFIG_P1012)    += p1021_serdes.o

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index c162c9d3e90333260bbce44ab86b01a5b7f6e8ea..7d81dfcbf61bb7f108802f5ed544fa1130927665 100644 (file)
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -129,7 +129,7 @@
 #define CONFIG_SYS_FSL_ERRATUM_A004508
 #define CONFIG_SYS_FSL_ERRATUM_A005125
 
-#elif defined(CONFIG_MPC8572)
+#elif defined(CONFIG_ARCH_MPC8572)
 #define CONFIG_MAX_CPUS                        2
 #define CONFIG_SYS_FSL_NUM_LAWS                12
 #define CONFIG_SYS_PPC_E500_DEBUG_TLB  2

diff --git a/arch/powerpc/include/asm/fsl_law.h b/arch/powerpc/include/asm/fsl_law.h
index 85278b36f51c1de733bb9e66328a9ce35b516b90..4e5ea5f936444b46d24dd87a87eb5191c30a8d2e 100644 (file)
--- a/arch/powerpc/include/asm/fsl_law.h
+++ b/arch/powerpc/include/asm/fsl_law.h
@@ -85,7 +85,7 @@ enum law_trgt_if {
 #if defined(CONFIG_ARCH_BSC9131) || defined(CONFIG_ARCH_BSC9132)
        LAW_TRGT_IF_OCN_DSP = 0x03,
 #else
-#if !defined(CONFIG_MPC8572) && !defined(CONFIG_P2020)
+#if !defined(CONFIG_ARCH_MPC8572) && !defined(CONFIG_P2020)
        LAW_TRGT_IF_PCIE_3 = 0x03,
 #endif
 #endif
@@ -121,7 +121,7 @@ enum law_trgt_if {
 #define LAW_TRGT_IF_PCIE_1     LAW_TRGT_IF_PCI
 #endif
 
-#if defined(CONFIG_MPC8572) || defined(CONFIG_P2020)
+#if defined(CONFIG_ARCH_MPC8572) || defined(CONFIG_P2020)
 #define LAW_TRGT_IF_PCIE_3     LAW_TRGT_IF_PCI
 #endif
 #endif /* CONFIG_FSL_CORENET */

diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index 123dcad4a13750ba1b54ddf55cc8773e9a5dd5d1..4aeccbf59fcecaeadde047fe405d53357fc30087 100644 (file)
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -2940,7 +2940,7 @@ struct ccsr_pman {
 #define CONFIG_SYS_MPC85xx_PCIX2_OFFSET                0x9000
 #define CONFIG_SYS_MPC85xx_PCIE1_OFFSET         0xa000
 #define CONFIG_SYS_MPC85xx_PCIE2_OFFSET         0x9000
-#if defined(CONFIG_MPC8572) || defined(CONFIG_P2020)
+#if defined(CONFIG_ARCH_MPC8572) || defined(CONFIG_P2020)
 #define CONFIG_SYS_MPC85xx_PCIE3_OFFSET         0x8000
 #else
 #define CONFIG_SYS_MPC85xx_PCIE3_OFFSET         0xb000

diff --git a/board/xes/common/Makefile b/board/xes/common/Makefile
index 65d321abddc7c5d67363745f86763129b286c023..1b2ec5cadc2ddc78dea97d89a11fd7594567f56e 100644 (file)
--- a/board/xes/common/Makefile
+++ b/board/xes/common/Makefile
@@ -6,7 +6,7 @@
 #
 
 obj-$(CONFIG_FSL_PCI_INIT)     += fsl_8xxx_pci.o
-obj-$(CONFIG_MPC8572)          += fsl_8xxx_clk.o
+obj-$(CONFIG_ARCH_MPC8572)             += fsl_8xxx_clk.o
 obj-$(CONFIG_MPC86xx)          += fsl_8xxx_clk.o
 obj-$(CONFIG_P2020)            += fsl_8xxx_clk.o
 obj-$(CONFIG_MPC85xx)          += fsl_8xxx_misc.o board.o

diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index d4be14007ff21ce22e3faf610b7bf88579e3d685..36d2ecce9df72b46d93c951a5551b530a238a490 100644 (file)
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -28,7 +28,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC8572         1
 #define CONFIG_MPC8572DS       1
 #define CONFIG_MP              1       /* support multiple processors */
 

diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h
index a82eef5b32c7fcdade43d8fe45a28a534382c7fc..61ee576aa83df7dada86852742a2637ed13629d6 100644 (file)
--- a/include/configs/xpedite537x.h
+++ b/include/configs/xpedite537x.h
@@ -16,7 +16,6 @@
  */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC8572         1
 #define CONFIG_XPEDITE5370     1
 #define CONFIG_SYS_BOARD_NAME  "XPedite5370"
 #define CONFIG_SYS_FORM_3U_VPX 1

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ab26d679b5e317f15292aa41efe73b1699bb4653..ecf15b859057ae30daeda796c4299f7b0f6a7ffc 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3142,7 +3142,6 @@ CONFIG_MPC83XX_PCI2
 CONFIG_MPC850
 CONFIG_MPC855
 CONFIG_MPC857
-CONFIG_MPC8572
 CONFIG_MPC8572DS
 CONFIG_MPC85XX_FEC
 CONFIG_MPC85XX_FEC_NAME