diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-18 19:26:09 (GMT) |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-24 07:42:11 (GMT) |
| commit | 529fb062081e100faae6dc0d163a548b8528ff24 (patch) | |
| tree | 367c51e2de5a3d1fb7b30eb85aad1d16f62a8011 | |
| parent | e71372cb6371033a762b3329d063c3735a783a76 (diff) | |
| download | u-boot-fsl-qoriq-529fb062081e100faae6dc0d163a548b8528ff24.tar.xz | |
powerpc: P4080DS: Remove macro CONFIG_P4080DS
Use CONFIG_TARGET_P4080DS instead.
Signed-off-by: York Sun <york.sun@nxp.com>
| -rw-r--r-- | board/freescale/common/Makefile | 4 | ||||
| -rw-r--r-- | board/freescale/corenet_ds/Makefile | 4 | ||||
| -rw-r--r-- | include/configs/P4080DS.h | 2 | ||||
| -rw-r--r-- | include/configs/corenet_ds.h | 4 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
5 files changed, 6 insertions, 9 deletions
diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile index 2797348..c26ada1 100644 --- a/board/freescale/common/Makefile +++ b/board/freescale/common/Makefile @@ -54,7 +54,7 @@ obj-$(CONFIG_TARGET_MPC8572DS) += ics307_clk.o obj-$(CONFIG_TARGET_P1022DS) += ics307_clk.o obj-$(CONFIG_P2020DS) += ics307_clk.o obj-$(CONFIG_TARGET_P3041DS) += ics307_clk.o -obj-$(CONFIG_P4080DS) += ics307_clk.o +obj-$(CONFIG_TARGET_P4080DS) += ics307_clk.o obj-$(CONFIG_P5020DS) += ics307_clk.o obj-$(CONFIG_P5040DS) += ics307_clk.o obj-$(CONFIG_VSC_CROSSBAR) += vsc3316_3308.o @@ -67,7 +67,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_TARGET_P3041DS) += p_corenet/ -obj-$(CONFIG_P4080DS) += p_corenet/ +obj-$(CONFIG_TARGET_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 daa8415..f5db922 100644 --- a/board/freescale/corenet_ds/Makefile +++ b/board/freescale/corenet_ds/Makefile @@ -9,10 +9,10 @@ obj-y += corenet_ds.o obj-y += ddr.o obj-$(CONFIG_TARGET_P3041DS) += eth_hydra.o -obj-$(CONFIG_P4080DS) += eth_p4080.o +obj-$(CONFIG_TARGET_P4080DS) += eth_p4080.o obj-$(CONFIG_P5020DS) += eth_hydra.o obj-$(CONFIG_P5040DS) += eth_superhydra.o obj-$(CONFIG_TARGET_P3041DS) += p3041ds_ddr.o -obj-$(CONFIG_P4080DS) += p4080ds_ddr.o +obj-$(CONFIG_TARGET_P4080DS) += p4080ds_ddr.o obj-$(CONFIG_P5020DS) += p5020ds_ddr.o obj-$(CONFIG_P5040DS) += p5040ds_ddr.o diff --git a/include/configs/P4080DS.h b/include/configs/P4080DS.h index 020144e..65ec8f7 100644 --- a/include/configs/P4080DS.h +++ b/include/configs/P4080DS.h @@ -8,8 +8,6 @@ * P4080 DS board configuration file * Also supports P4040 DS */ -#define CONFIG_P4080DS - #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 7a4c578..fbc2758 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -26,7 +26,7 @@ #define CONFIG_SYS_FSL_PBL_PBI board/freescale/corenet_ds/pbi.cfg #if defined(CONFIG_TARGET_P3041DS) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p3041ds.cfg -#elif defined(CONFIG_P4080DS) +#elif defined(CONFIG_TARGET_P4080DS) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p4080ds.cfg #elif defined(CONFIG_P5020DS) #define CONFIG_SYS_FSL_PBL_RCW board/freescale/corenet_ds/rcw_p5020ds.cfg @@ -680,7 +680,7 @@ #define CONFIG_BAUDRATE 115200 -#ifdef CONFIG_P4080DS +#ifdef CONFIG_TARGET_P4080DS #define __USB_PHY_TYPE ulpi #else #define __USB_PHY_TYPE utmi diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3830f10..e92836f 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_P4080DS CONFIG_P5020DS CONFIG_P5040DS CONFIG_PAGE_CNT_MASK |