powerpc: P5020DS: Remove macro CONFIG_P5020DS

Use CONFIG_TARGET_P5020DS instead.

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

diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile
index c26ada12163cfb2b85af1c49ce3f446fae621e64..73a722a6c7034a1e4a3a51b179a5836d5092cb5a 100644 (file)
--- a/board/freescale/common/Makefile
+++ b/board/freescale/common/Makefile
@@ -55,7 +55,7 @@ obj-$(CONFIG_TARGET_P1022DS)          += ics307_clk.o
 obj-$(CONFIG_P2020DS)          += ics307_clk.o
 obj-$(CONFIG_TARGET_P3041DS)           += ics307_clk.o
 obj-$(CONFIG_TARGET_P4080DS)           += ics307_clk.o
-obj-$(CONFIG_P5020DS)          += ics307_clk.o
+obj-$(CONFIG_TARGET_P5020DS)           += ics307_clk.o
 obj-$(CONFIG_P5040DS)          += ics307_clk.o
 obj-$(CONFIG_VSC_CROSSBAR)    += vsc3316_3308.o
 obj-$(CONFIG_IDT8T49N222A)     += idt8t49n222a_serdes_clk.o
@@ -68,7 +68,7 @@ obj-$(CONFIG_LS102XA_STREAM_ID)       += ls102xa_stream_id.o
 obj-$(CONFIG_TARGET_P2041RDB)  += p_corenet/
 obj-$(CONFIG_TARGET_P3041DS)   += p_corenet/
 obj-$(CONFIG_TARGET_P4080DS)   += p_corenet/
-obj-$(CONFIG_P5020DS)  += p_corenet/
+obj-$(CONFIG_TARGET_P5020DS)   += p_corenet/
 obj-$(CONFIG_P5040DS)  += p_corenet/
 
 obj-$(CONFIG_LAYERSCAPE_NS_ACCESS)     += ns_access.o

diff --git a/board/freescale/corenet_ds/Makefile b/board/freescale/corenet_ds/Makefile
index f5db922cf5de5f16b056778ec759d5cc45347b73..6bd54c09dff8a39210783abfcce7596f9a622fc7 100644 (file)
--- a/board/freescale/corenet_ds/Makefile
+++ b/board/freescale/corenet_ds/Makefile
@@ -10,9 +10,9 @@ obj-y += corenet_ds.o
 obj-y  += ddr.o
 obj-$(CONFIG_TARGET_P3041DS)   += eth_hydra.o
 obj-$(CONFIG_TARGET_P4080DS)   += eth_p4080.o
-obj-$(CONFIG_P5020DS)  += eth_hydra.o
+obj-$(CONFIG_TARGET_P5020DS)   += eth_hydra.o
 obj-$(CONFIG_P5040DS)  += eth_superhydra.o
 obj-$(CONFIG_TARGET_P3041DS)   += p3041ds_ddr.o
 obj-$(CONFIG_TARGET_P4080DS)   += p4080ds_ddr.o
-obj-$(CONFIG_P5020DS)  += p5020ds_ddr.o
+obj-$(CONFIG_TARGET_P5020DS)   += p5020ds_ddr.o
 obj-$(CONFIG_P5040DS)  += p5040ds_ddr.o

diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c
index 632b37b6e8eb450e86891b359be1bb7f13166e68..cc33d5c55d94a30fc13348faf760c8c45fff41eb 100644 (file)
--- a/board/freescale/corenet_ds/corenet_ds.c
+++ b/board/freescale/corenet_ds/corenet_ds.c
@@ -26,7 +26,7 @@ int checkboard (void)
 {
        u8 sw;
        struct cpu_type *cpu = gd->arch.cpu;
-#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_P5020DS) || \
+#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_TARGET_P5020DS) || \
        defined(CONFIG_P5040DS)
        unsigned int i;
 #endif
@@ -56,7 +56,7 @@ int checkboard (void)
         * don't match.
         */
        puts("SERDES Reference Clocks: ");
-#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_P5020DS) \
+#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_TARGET_P5020DS) \
        || defined(CONFIG_P5040DS)
        sw = in_8(&PIXIS_SW(5));
        for (i = 0; i < 3; i++) {
@@ -136,7 +136,7 @@ int misc_init_r(void)
        unsigned int i;
        u8 sw;
 
-#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_P5020DS) \
+#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_TARGET_P5020DS) \
        || defined(CONFIG_P5040DS)
        sw = in_8(&PIXIS_SW(5));
        for (i = 0; i < 3; i++) {

diff --git a/include/configs/P5020DS.h b/include/configs/P5020DS.h
index a942d0c10e5de2493997e7d73e886b1b7fae2971..17e941e4e7e7a8b74f969a185e0a19f9bcfd36c3 100644 (file)
--- a/include/configs/P5020DS.h
+++ b/include/configs/P5020DS.h
@@ -8,8 +8,6 @@
  * P5020 DS board configuration file
  * Also supports P5010 DS
  */
-#define CONFIG_P5020DS
-
 #define CONFIG_FSL_NGPIXIS             /* use common ngPIXIS code */
 
 #define CONFIG_MMC

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index fbc275863435e0086d0307f955041e57da719203..bd8e504e9e5c2a1c1dc0b9bb857bac9f13222224 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -28,7 +28,7 @@
 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p3041ds.cfg
 #elif defined(CONFIG_TARGET_P4080DS)
 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p4080ds.cfg
-#elif defined(CONFIG_P5020DS)
+#elif defined(CONFIG_TARGET_P5020DS)
 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p5020ds.cfg
 #elif defined(CONFIG_P5040DS)
 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p5040ds.cfg

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8af8ffc8d7e9a6e6675e5d5d9a58c567c44f4196..4e97976b34d3d648d29e0f2063e8631ee34c63e5 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3383,7 +3383,6 @@ CONFIG_OS2_ENV_ADDR
 CONFIG_OS_ENV_ADDR
 CONFIG_OTHBOOTARGS
 CONFIG_OVERWRITE_ETHADDR_ONCE
-CONFIG_P5020DS
 CONFIG_P5040DS
 CONFIG_PAGE_CNT_MASK
 CONFIG_PAGE_CNT_SHIFT