diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-18 19:40:51 (GMT) |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-24 07:42:11 (GMT) |
| commit | 161b472482626703f13033e6859a0dd00fe2bcae (patch) | |
| tree | 7803c758a40be2101ce3046cd1ea80c727dd5b60 /board/freescale | |
| parent | 95390360121451337738f73ed2f75f8dfbdce831 (diff) | |
| download | u-boot-161b472482626703f13033e6859a0dd00fe2bcae.tar.xz | |
powerpc: P5040DS: Remove macro CONFIG_P5040DS
Use CONFIG_TARGET_P5040DS instead.
Signed-off-by: York Sun <york.sun@nxp.com>
Diffstat (limited to 'board/freescale')
| -rw-r--r-- | board/freescale/common/Makefile | 4 | ||||
| -rw-r--r-- | board/freescale/corenet_ds/Makefile | 4 | ||||
| -rw-r--r-- | board/freescale/corenet_ds/corenet_ds.c | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile index 73a722a..e941949 100644 --- a/board/freescale/common/Makefile +++ b/board/freescale/common/Makefile @@ -56,7 +56,7 @@ obj-$(CONFIG_P2020DS) += ics307_clk.o obj-$(CONFIG_TARGET_P3041DS) += ics307_clk.o obj-$(CONFIG_TARGET_P4080DS) += 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_IDT8T49N222A) += idt8t49n222a_serdes_clk.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_P4080DS) += 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 diff --git a/board/freescale/corenet_ds/Makefile b/board/freescale/corenet_ds/Makefile index 6bd54c0..100ba92 100644 --- a/board/freescale/corenet_ds/Makefile +++ b/board/freescale/corenet_ds/Makefile @@ -11,8 +11,8 @@ obj-y += ddr.o obj-$(CONFIG_TARGET_P3041DS) += eth_hydra.o obj-$(CONFIG_TARGET_P4080DS) += eth_p4080.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_P4080DS) += p4080ds_ddr.o obj-$(CONFIG_TARGET_P5020DS) += p5020ds_ddr.o -obj-$(CONFIG_P5040DS) += p5040ds_ddr.o +obj-$(CONFIG_TARGET_P5040DS) += p5040ds_ddr.o diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c index cc33d5c..93e1258 100644 --- a/board/freescale/corenet_ds/corenet_ds.c +++ b/board/freescale/corenet_ds/corenet_ds.c @@ -27,7 +27,7 @@ int checkboard (void) u8 sw; struct cpu_type *cpu = gd->arch.cpu; #if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_TARGET_P5020DS) || \ - defined(CONFIG_P5040DS) + defined(CONFIG_TARGET_P5040DS) unsigned int i; #endif static const char * const freq[] = {"100", "125", "156.25", "212.5" }; @@ -56,15 +56,15 @@ int checkboard (void) * don't match. */ puts("SERDES Reference Clocks: "); -#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_TARGET_P5020DS) \ - || defined(CONFIG_P5040DS) +#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_TARGET_P5020DS) || \ + defined(CONFIG_TARGET_P5040DS) sw = in_8(&PIXIS_SW(5)); for (i = 0; i < 3; i++) { unsigned int clock = (sw >> (6 - (2 * i))) & 3; 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 */ sw = in_8(&PIXIS_SW(9)); printf("Bank4=%sMhz ", freq[sw & 3]); @@ -136,8 +136,8 @@ int misc_init_r(void) unsigned int i; u8 sw; -#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_TARGET_P5020DS) \ - || defined(CONFIG_P5040DS) +#if defined(CONFIG_TARGET_P3041DS) || defined(CONFIG_TARGET_P5020DS) || \ + defined(CONFIG_TARGET_P5040DS) sw = in_8(&PIXIS_SW(5)); for (i = 0; i < 3; i++) { unsigned int clock = (sw >> (6 - (2 * i))) & 3; |