powerpc: P1023: Remove macro CONFIG_P1023

Replace CONFIG_P1023 with ARCH_P1023 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 4d9ffd37db04fefc6aa5bcad5f91e699a8fd4872..0c498d8859654c96ad472706193403bc5c1550d5 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Kconfig
+++ b/arch/powerpc/cpu/mpc85xx/Kconfig
@@ -114,6 +114,7 @@ config TARGET_P1022DS
 
 config TARGET_P1023RDB
        bool "Support P1023RDB"
+       select ARCH_P1023
 
 config TARGET_P1_P2_RDB_PC
        bool "Support p1_p2_rdb_pc"
@@ -243,6 +244,9 @@ config ARCH_P1010
 config ARCH_P1022
        bool
 
+config ARCH_P1023
+       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 939f681402a78efdcd4512c3f5ff69de3440125d..a663379411fc1f68d2a9fe70654d65857f2727dc 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/Makefile
+++ b/arch/powerpc/cpu/mpc85xx/Makefile
@@ -81,7 +81,7 @@ obj-$(CONFIG_P1017)   += p1023_serdes.o
 obj-$(CONFIG_P1020)    += p1021_serdes.o
 obj-$(CONFIG_P1021)    += p1021_serdes.o
 obj-$(CONFIG_ARCH_P1022)       += p1022_serdes.o
-obj-$(CONFIG_P1023)    += p1023_serdes.o
+obj-$(CONFIG_ARCH_P1023)       += p1023_serdes.o
 obj-$(CONFIG_P1024)    += p1021_serdes.o
 obj-$(CONFIG_P1025)    += p1021_serdes.o
 obj-$(CONFIG_P2010)    += p2020_serdes.o

diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h
index 471d27ae1d2d0e7a5f79b7c61dafb44250962e2d..8ad503e73e43f96a367c3b933931532610a5b906 100644 (file)
--- a/arch/powerpc/include/asm/config_mpc85xx.h
+++ b/arch/powerpc/include/asm/config_mpc85xx.h
@@ -298,7 +298,7 @@
 #define CONFIG_SYS_FSL_ERRATUM_A005125
 #define CONFIG_SYS_FSL_ERRATUM_A004477
 
-#elif defined(CONFIG_P1023)
+#elif defined(CONFIG_ARCH_P1023)
 #define CONFIG_MAX_CPUS                        2
 #define CONFIG_SYS_FSL_NUM_LAWS                12
 #define CONFIG_SYS_FSL_SEC_COMPAT      4

diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index 0f22e98559d7b696be13cb84816685d355f55392..2e9a34364c2f4b4478795694256e863615bbd25c 100644 (file)
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -2150,7 +2150,7 @@ typedef struct ccsr_gur {
 #define PORBMSR_ROMLOC_NOR     0xf
        u32     porimpscr;      /* POR I/O impedance status & control */
        u32     pordevsr;       /* POR I/O device status regsiter */
-#if defined(CONFIG_P1017) || defined(CONFIG_P1023)
+#if defined(CONFIG_P1017) || defined(CONFIG_ARCH_P1023)
 #define MPC85xx_PORDEVSR_SGMII1_DIS    0x10000000
 #define MPC85xx_PORDEVSR_SGMII2_DIS    0x08000000
 #define MPC85xx_PORDEVSR_TSEC1_PRTC    0x02000000
@@ -2165,7 +2165,7 @@ typedef struct ccsr_gur {
 #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)
+#elif defined(CONFIG_P1017) || defined(CONFIG_ARCH_P1023)
 #define MPC85xx_PORDEVSR_IO_SEL                0x00600000
 #define MPC85xx_PORDEVSR_IO_SEL_SHIFT  21
 #else
@@ -2268,7 +2268,7 @@ typedef struct ccsr_gur {
 #define MPC85xx_PMUXCR_CAN2_TDM                        0x00000002
 #define MPC85xx_PMUXCR_CAN2_RES                        0x00000003
 #endif
-#if defined(CONFIG_P1017) || defined(CONFIG_P1023)
+#if defined(CONFIG_P1017) || defined(CONFIG_ARCH_P1023)
 #define MPC85xx_PMUXCR_TSEC1_1         0x10000000
 #else
 #define MPC85xx_PMUXCR_SD_DATA         0x80000000

diff --git a/drivers/net/fm/Makefile b/drivers/net/fm/Makefile
index 316fef485dac6e1e8ffa46ee99acdd6dda0df293..05abbcffe84641197a19a49a36a187a151ed173a 100644 (file)
--- a/drivers/net/fm/Makefile
+++ b/drivers/net/fm/Makefile
@@ -18,7 +18,7 @@ obj-$(CONFIG_SYS_FMAN_V3) += memac.o
 
 # SoC specific SERDES support
 obj-$(CONFIG_P1017)    += p1023.o
-obj-$(CONFIG_P1023)    += p1023.o
+obj-$(CONFIG_ARCH_P1023)       += p1023.o
 # The P204x, P304x, and P5020 are the same
 obj-$(CONFIG_PPC_P2041) += p5020.o
 obj-$(CONFIG_PPC_P3041) += p5020.o

diff --git a/drivers/net/fm/fm.h b/drivers/net/fm/fm.h
index fa9bc9f42dbcfbb424a8a7be7dc371fbd5527073..d31b19662b4484233e5a0e6c1eea237b4e856244 100644 (file)
--- a/drivers/net/fm/fm.h
+++ b/drivers/net/fm/fm.h
@@ -88,7 +88,7 @@ struct fm_port_global_pram {
 #define PRAM_MODE_GLOBAL       0x20000000
 #define PRAM_MODE_GRACEFUL_STOP        0x00800000
 
-#if defined(CONFIG_P1017) || defined(CONFIG_P1023)
+#if defined(CONFIG_P1017) || defined(CONFIG_ARCH_P1023)
 #define FM_FREE_POOL_SIZE      0x2000 /* 8K bytes */
 #else
 #define FM_FREE_POOL_SIZE      0x20000 /* 128K bytes */

diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h
index eba66ec9324bbf6277f000a24338fd004db58981..5061286c3fffb86e2c9f54ddf20863ce6e117105 100644 (file)
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -25,7 +25,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           /* BOOKE */
 #define CONFIG_E500            /* BOOKE e500 family */
-#define CONFIG_P1023
 #define CONFIG_MP              /* support multiple processors */
 
 #define CONFIG_FSL_ELBC                /* Has Enhanced localbus controller */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 3bb631261b35f3073263275afd119ee3de2277bb..b2db329b11e076f806a517728bbfd5a8cee96f45 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_P1023
 CONFIG_P1024
 CONFIG_P1024RDB
 CONFIG_P1025