GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 22:51:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

powerpc: P5040DS: Remove macro CONFIG_P5040DS

Browse source 
Use CONFIG_TARGET_P5040DS instead.

Signed-off-by: York Sun <york.sun@nxp.com>
This commit is contained in:
York Sun 2016-11-18 11:40:51 -08:00
parent 9539036012
commit 161b472482
6 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
board/freescale/common/Makefile
View file

@ -56,7 +56,7 @@ obj-$(CONFIG_P2020DS) += ics307_clk.o
obj-$(CONFIG_TARGET_P3041DS) += ics307_clk.o obj-$(CONFIG_TARGET_P3041DS) += ics307_clk.o
obj-$(CONFIG_TARGET_P4080DS) += ics307_clk.o obj-$(CONFIG_TARGET_P4080DS) += ics307_clk.o
obj-$(CONFIG_TARGET_P5020DS) += ics307_clk.o obj-$(CONFIG_TARGET_P5020DS) += ics307_clk.o
obj-$(CONFIG_P5040DS) += ics307_clk.o obj-$(CONFIG_TARGET_P5040DS) += ics307_clk.o
obj-$(CONFIG_VSC_CROSSBAR) += vsc3316_3308.o obj-$(CONFIG_VSC_CROSSBAR) += vsc3316_3308.o
obj-$(CONFIG_IDT8T49N222A) += idt8t49n222a_serdes_clk.o obj-$(CONFIG_IDT8T49N222A) += idt8t49n222a_serdes_clk.o
obj-$(CONFIG_ZM7300) += zm7300.o obj-$(CONFIG_ZM7300) += zm7300.o
@ -69,7 +69,7 @@ obj-$(CONFIG_TARGET_P2041RDB) += p_corenet/
obj-$(CONFIG_TARGET_P3041DS) += p_corenet/ obj-$(CONFIG_TARGET_P3041DS) += p_corenet/
obj-$(CONFIG_TARGET_P4080DS) += p_corenet/ obj-$(CONFIG_TARGET_P4080DS) += p_corenet/
obj-$(CONFIG_TARGET_P5020DS) += p_corenet/ obj-$(CONFIG_TARGET_P5020DS) += p_corenet/
obj-$(CONFIG_P5040DS) += p_corenet/ obj-$(CONFIG_TARGET_P5040DS) += p_corenet/
obj-$(CONFIG_LAYERSCAPE_NS_ACCESS) += ns_access.o obj-$(CONFIG_LAYERSCAPE_NS_ACCESS) += ns_access.o

4
board/freescale/corenet_ds/Makefile
View file

@ -11,8 +11,8 @@ obj-y += ddr.o
obj-$(CONFIG_TARGET_P3041DS) += eth_hydra.o obj-$(CONFIG_TARGET_P3041DS) += eth_hydra.o
obj-$(CONFIG_TARGET_P4080DS) += eth_p4080.o obj-$(CONFIG_TARGET_P4080DS) += eth_p4080.o
obj-$(CONFIG_TARGET_P5020DS) += eth_hydra.o obj-$(CONFIG_TARGET_P5020DS) += eth_hydra.o
obj-$(CONFIG_P5040DS) += eth_superhydra.o obj-$(CONFIG_TARGET_P5040DS) += eth_superhydra.o
obj-$(CONFIG_TARGET_P3041DS) += p3041ds_ddr.o obj-$(CONFIG_TARGET_P3041DS) += p3041ds_ddr.o
obj-$(CONFIG_TARGET_P4080DS) += p4080ds_ddr.o obj-$(CONFIG_TARGET_P4080DS) += p4080ds_ddr.o
obj-$(CONFIG_TARGET_P5020DS) += p5020ds_ddr.o obj-$(CONFIG_TARGET_P5020DS) += p5020ds_ddr.o
obj-$(CONFIG_P5040DS) += p5040ds_ddr.o obj-$(CONFIG_TARGET_P5040DS) += p5040ds_ddr.o

12
board/freescale/corenet_ds/corenet_ds.c
View file

@ -27,7 +27,7 @@ int checkboard (void)
u8 sw; u8 sw;
struct cpu_type *cpu = gd->arch.cpu; struct cpu_type *cpu = gd->arch.cpu;
#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_TARGET_P5020DS) || \ #if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_TARGET_P5020DS) || \
defined(CONFIG_P5040DS) defined(CONFIG_TARGET_P5040DS)
unsigned int i; unsigned int i;
#endif #endif
static const char * const freq[] = {"100", "125", "156.25", "212.5" }; static const char * const freq[] = {"100", "125", "156.25", "212.5" };
@ -56,15 +56,15 @@ int checkboard (void)
* don't match. * don't match.
*/ */
puts("SERDES Reference Clocks: "); puts("SERDES Reference Clocks: ");
#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_TARGET_P5020DS) \ #if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_TARGET_P5020DS) || \
|| defined(CONFIG_P5040DS) defined(CONFIG_TARGET_P5040DS)
sw = in_8(&PIXIS_SW(5)); sw = in_8(&PIXIS_SW(5));
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
unsigned int clock = (sw >> (6 - (2 * i))) & 3; unsigned int clock = (sw >> (6 - (2 * i))) & 3;
printf("Bank%u=%sMhz ", i+1, freq[clock]); printf("Bank%u=%sMhz ", i+1, freq[clock]);
} }
#ifdef CONFIG_P5040DS #ifdef CONFIG_TARGET_P5040DS
/* On P5040DS, SW11[7:8] determines the Bank 4 frequency */ /* On P5040DS, SW11[7:8] determines the Bank 4 frequency */
sw = in_8(&PIXIS_SW(9)); sw = in_8(&PIXIS_SW(9));
printf("Bank4=%sMhz ", freq[sw & 3]); printf("Bank4=%sMhz ", freq[sw & 3]);
@ -136,8 +136,8 @@ int misc_init_r(void)
unsigned int i; unsigned int i;
u8 sw; u8 sw;
#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_TARGET_P5020DS) \ #if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_TARGET_P5020DS) || \
|| defined(CONFIG_P5040DS) defined(CONFIG_TARGET_P5040DS)
sw = in_8(&PIXIS_SW(5)); sw = in_8(&PIXIS_SW(5));
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
unsigned int clock = (sw >> (6 - (2 * i))) & 3; unsigned int clock = (sw >> (6 - (2 * i))) & 3;

2
include/configs/P5040DS.h
View file

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

2
include/configs/corenet_ds.h
View file

@ -30,7 +30,7 @@
#define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p4080ds.cfg #define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p4080ds.cfg
#elif defined(CONFIG_TARGET_P5020DS) #elif defined(CONFIG_TARGET_P5020DS)
#define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p5020ds.cfg #define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p5020ds.cfg
#elif defined(CONFIG_P5040DS) #elif defined(CONFIG_TARGET_P5040DS)
#define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p5040ds.cfg #define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p5040ds.cfg
#endif #endif
#endif #endif

1
scripts/config_whitelist.txt
View file

@ -3383,7 +3383,6 @@ CONFIG_OS2_ENV_ADDR
CONFIG_OS_ENV_ADDR CONFIG_OS_ENV_ADDR
CONFIG_OTHBOOTARGS CONFIG_OTHBOOTARGS
CONFIG_OVERWRITE_ETHADDR_ONCE CONFIG_OVERWRITE_ETHADDR_ONCE
CONFIG_P5040DS
CONFIG_PAGE_CNT_MASK CONFIG_PAGE_CNT_MASK
CONFIG_PAGE_CNT_SHIFT CONFIG_PAGE_CNT_SHIFT
CONFIG_PALMAS_AUDPWR CONFIG_PALMAS_AUDPWR