powerpc: P3041DS: Remove macro CONFIG_P3041DS

Use CONFIG_TARGET_P3041DS instead.

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

diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile
index 6295d1c9990db754baae5b3e185e29d668fb8174..2797348ec51681e30b5d769334fe58f5df18ddae 100644 (file)
--- a/board/freescale/common/Makefile
+++ b/board/freescale/common/Makefile
@@ -53,7 +53,7 @@ obj-$(CONFIG_TARGET_MPC8536DS)        += ics307_clk.o
 obj-$(CONFIG_TARGET_MPC8572DS) += ics307_clk.o
 obj-$(CONFIG_TARGET_P1022DS)           += ics307_clk.o
 obj-$(CONFIG_P2020DS)          += ics307_clk.o
-obj-$(CONFIG_P3041DS)          += ics307_clk.o
+obj-$(CONFIG_TARGET_P3041DS)           += ics307_clk.o
 obj-$(CONFIG_P4080DS)          += ics307_clk.o
 obj-$(CONFIG_P5020DS)          += ics307_clk.o
 obj-$(CONFIG_P5040DS)          += ics307_clk.o
@@ -66,7 +66,7 @@ obj-$(CONFIG_LS102XA_STREAM_ID)       += ls102xa_stream_id.o
 
 # deal with common files for P-series corenet based devices
 obj-$(CONFIG_TARGET_P2041RDB)  += p_corenet/
-obj-$(CONFIG_P3041DS)  += p_corenet/
+obj-$(CONFIG_TARGET_P3041DS)   += p_corenet/
 obj-$(CONFIG_P4080DS)  += p_corenet/
 obj-$(CONFIG_P5020DS)  += p_corenet/
 obj-$(CONFIG_P5040DS)  += p_corenet/

diff --git a/board/freescale/corenet_ds/Makefile b/board/freescale/corenet_ds/Makefile
index 9ade9472eac6863ade1a485ccf094055c3d348bc..daa84157d06eb2ee11a51e6b7edc51e51cf36b07 100644 (file)
--- a/board/freescale/corenet_ds/Makefile
+++ b/board/freescale/corenet_ds/Makefile
@@ -8,11 +8,11 @@
 
 obj-y  += corenet_ds.o
 obj-y  += ddr.o
-obj-$(CONFIG_P3041DS)  += eth_hydra.o
+obj-$(CONFIG_TARGET_P3041DS)   += eth_hydra.o
 obj-$(CONFIG_P4080DS)  += eth_p4080.o
 obj-$(CONFIG_P5020DS)  += eth_hydra.o
 obj-$(CONFIG_P5040DS)  += eth_superhydra.o
-obj-$(CONFIG_P3041DS)  += p3041ds_ddr.o
+obj-$(CONFIG_TARGET_P3041DS)   += p3041ds_ddr.o
 obj-$(CONFIG_P4080DS)  += p4080ds_ddr.o
 obj-$(CONFIG_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 8a44a9a972d4f05582217c52933e1924124bd1cf..632b37b6e8eb450e86891b359be1bb7f13166e68 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_P3041DS) || defined(CONFIG_P5020DS) || \
+#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_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_P3041DS) || defined(CONFIG_P5020DS) \
+#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_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_P3041DS) || defined(CONFIG_P5020DS) \
+#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_P5020DS) \
        || defined(CONFIG_P5040DS)
        sw = in_8(&PIXIS_SW(5));
        for (i = 0; i < 3; i++) {

diff --git a/include/configs/P3041DS.h b/include/configs/P3041DS.h
index 01507478ca063202a2477f82fae83dc46607244c..52ef4321d65120478b3ea2db38cd5d006370023c 100644 (file)
--- a/include/configs/P3041DS.h
+++ b/include/configs/P3041DS.h
@@ -8,8 +8,6 @@
  * P3041 DS board configuration file
  *
  */
-#define CONFIG_P3041DS
-
 #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 3807d456c7cbecd612a5fb4cbc067aa2307b5e2a..7a4c57832111d9c8cb23cdc204c41d7fc50d04e1 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -24,7 +24,7 @@
 #define CONFIG_RAMBOOT_TEXT_BASE       CONFIG_SYS_TEXT_BASE
 #define CONFIG_RESET_VECTOR_ADDRESS    0xfffffffc
 #define CONFIG_SYS_FSL_PBL_PBI board/freescale/corenet_ds/pbi.cfg
-#if defined(CONFIG_P3041DS)
+#if defined(CONFIG_TARGET_P3041DS)
 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p3041ds.cfg
 #elif defined(CONFIG_P4080DS)
 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p4080ds.cfg

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2028d18743a29c520c758773fba0c06baca377ce..10dedf6c465ec103f4b5163506da316a94f1fb4e 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_P3041DS
 CONFIG_P4080DS
 CONFIG_P5020DS
 CONFIG_P5040DS