powerpc: P1022: Remove macro CONFIG_P1022

Replace CONFIG_P1022 with ARCH_P1022 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 89573f8c3181b5023d710a7d548cf6d39b0edfdd..4d9ffd37db04fefc6aa5bcad5f91e699a8fd4872 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -108,6 +108,7 @@ config TARGET_P1010RDB_PB
 
 config TARGET_P1022DS
        bool "Support P1022DS"
+       select ARCH_P1022
        select SUPPORT_SPL
        select SUPPORT_TPL
 
@@ -171,6 +172,7 @@ config TARGET_T4240RDB
 
 config TARGET_CONTROLCENTERD
        bool "Support controlcenterd"
+       select ARCH_P1022
 
 config TARGET_KMP204X
        bool "Support kmp204x"
@@ -238,6 +240,9 @@ config ARCH_MPC8572
 config ARCH_P1010
        bool
 
+config ARCH_P1022
+       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 de42b6560ac2d218d9015ae873ba8cde210deea0..939f681402a78efdcd4512c3f5ff69de3440125d 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Makefile
+++ b/arch/powerpc/cpu/mpc85xx/Makefile
@@ -80,7 +80,7 @@ obj-$(CONFIG_P1014)   += p1010_serdes.o
 obj-$(CONFIG_P1017)    += p1023_serdes.o
 obj-$(CONFIG_P1020)    += p1021_serdes.o
 obj-$(CONFIG_P1021)    += p1021_serdes.o
-obj-$(CONFIG_P1022)    += p1022_serdes.o
+obj-$(CONFIG_ARCH_P1022)       += p1022_serdes.o
 obj-$(CONFIG_P1023)    += p1023_serdes.o
 obj-$(CONFIG_P1024)    += p1021_serdes.o
 obj-$(CONFIG_P1025)    += p1021_serdes.o

diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index c20bc9d3d1ee8848fbd8e886a48a9f1de4bd9c76..2af9143683d280ca81cf26c7348c66f75960a0d0 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -683,7 +683,7 @@ int get_clocks (void)
         */
 #if defined(CONFIG_ARCH_MPC8540) || defined(CONFIG_ARCH_MPC8541) || \
        defined(CONFIG_ARCH_MPC8560) || defined(CONFIG_ARCH_MPC8555) || \
-       defined(CONFIG_P1022)
+       defined(CONFIG_ARCH_P1022)
        gd->arch.i2c1_clk = sys_info.freq_systembus;
 #elif defined(CONFIG_ARCH_MPC8544)
        /*

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index adad3d34501a916dace16cb15f83f173250e332f..471d27ae1d2d0e7a5f79b7c61dafb44250962e2d 100644 (file)
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -283,7 +283,7 @@
 #define CONFIG_SYS_FSL_ERRATUM_A005125
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 
-#elif defined(CONFIG_P1022)
+#elif defined(CONFIG_ARCH_P1022)
 #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/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index 0cd90d126d2f2e8a998e9086eb873996068a2b30..0f22e98559d7b696be13cb84816685d355f55392 100644 (file)
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -2162,7 +2162,7 @@ typedef struct ccsr_gur {
 #define MPC85xx_PORDEVSR_SGMII4_DIS    0x04000000
 #define MPC85xx_PORDEVSR_SRDS2_IO_SEL  0x38000000
 #define MPC85xx_PORDEVSR_PCI1          0x00800000
-#if defined(CONFIG_P1013) || defined(CONFIG_P1022)
+#if defined(CONFIG_P1013) || defined(CONFIG_ARCH_P1022)
 #define MPC85xx_PORDEVSR_IO_SEL                0x007c0000
 #define MPC85xx_PORDEVSR_IO_SEL_SHIFT  18
 #elif defined(CONFIG_P1017) || defined(CONFIG_P1023)
@@ -2290,7 +2290,7 @@ typedef struct ccsr_gur {
 #define MPC85xx_PMUXCR_QE11            0x00000010
 #define MPC85xx_PMUXCR_QE12            0x00000008
 #endif
-#if defined(CONFIG_P1013) || defined(CONFIG_P1022)
+#if defined(CONFIG_P1013) || defined(CONFIG_ARCH_P1022)
 #define MPC85xx_PMUXCR_TDM_MASK                0x0001cc00
 #define MPC85xx_PMUXCR_TDM             0x00014800
 #define MPC85xx_PMUXCR_SPI_MASK                0x00600000
@@ -2375,7 +2375,7 @@ typedef struct ccsr_gur {
 #define MPC85xx_PMUXCR2_DEBUG_MUX_SEL_USBPHY   0x00002000
 #define MPC85xx_PMUXCR2_PLL_LKDT_EXPOSE                0x00001000
 #endif
-#if defined(CONFIG_P1013) || defined(CONFIG_P1022)
+#if defined(CONFIG_P1013) || defined(CONFIG_ARCH_P1022)
 #define MPC85xx_PMUXCR2_ETSECUSB_MASK  0x001f8000
 #define MPC85xx_PMUXCR2_USB            0x00150000
 #endif

diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 6a4937bf1e38a68b216f07e8ce67e202a4fce9cb..88d1d358699541d71c2631e983a02dd87c7d32c0 100644 (file)
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -90,7 +90,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE                   /* BOOKE */
 #define CONFIG_E500                    /* BOOKE e500 family */
-#define CONFIG_P1022
 #define CONFIG_P1022DS
 #define CONFIG_MP                      /* support multiple processors */
 

diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h
index 5e1f1b01395de45d9a52fa8295d67029760c5b2b..b824e3bd2348e87c23cdf825fb49952c9f92594f 100644 (file)
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -37,7 +37,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE                   /* BOOKE */
 #define CONFIG_E500                    /* BOOKE e500 family */
-#define CONFIG_P1022
 #define CONFIG_CONTROLCENTERD
 #define CONFIG_MP                      /* support multiple processors */
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2829c52faf79e8aa9e1018a0193aa37ed08d5c38..5af7e61a533d932cc8c197de454d1ed7aff02227 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3390,7 +3390,6 @@ CONFIG_P1020RDB_PD
 CONFIG_P1020UTM
 CONFIG_P1021
 CONFIG_P1021RDB
-CONFIG_P1022
 CONFIG_P1022DS
 CONFIG_P1023
 CONFIG_P1024