Use CONFIG_TARGET_P3041DS instead.
Signed-off-by: York Sun york.sun@nxp.com ---
board/freescale/common/Makefile | 4 ++-- board/freescale/corenet_ds/Makefile | 4 ++-- board/freescale/corenet_ds/corenet_ds.c | 6 +++--- include/configs/P3041DS.h | 2 -- include/configs/corenet_ds.h | 2 +- scripts/config_whitelist.txt | 1 - 6 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile index 6295d1c..2797348 100644 --- 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 9ade947..daa8415 100644 --- 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 8a44a9a..632b37b 100644 --- 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 0150747..52ef432 100644 --- 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 3807d45..7a4c578 100644 --- 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 2028d18..10dedf6 100644 --- 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