leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc: P3041DS: Remove macro CONFIG_P3041DS

Browse Source 
Use CONFIG_TARGET_P3041DS instead.

Signed-off-by: York Sun <york.sun@nxp.com>
This commit is contained in:
York Sun 2016-11-18 11:22:17 -08:00
parent 5e5fdd2d00
commit 850af2c7a9
6 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/freescale/common/Makefile
View File

@ -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/

4
board/freescale/corenet_ds/Makefile
View File

@ -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

6
board/freescale/corenet_ds/corenet_ds.c
View File

@ -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++) {

2
include/configs/P3041DS.h
View File

@ -8,8 +8,6 @@
* P3041 DS board configuration file
*
*/
#define CONFIG_P3041DS
#define CONFIG_FSL_NGPIXIS /* use common ngPIXIS code */
#define CONFIG_MMC

2
include/configs/corenet_ds.h
View File

@ -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

1
scripts/config_whitelist.txt
View File

@ -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