diff options
| author | York Sun <york.sun@nxp.com> | 2016-11-16 11:09:07 -0800 |
|---|---|---|
| committer | York Sun <york.sun@nxp.com> | 2016-11-23 23:42:04 -0800 |
| commit | 30411e7cfc5a54856536881b893439dc158023a9 (patch) | |
| tree | 433487c8e63c0b3334a0b808fb50422a504c3801 | |
| parent | 24ad75ae55e7136e958e00380d58c87696216657 (diff) | |
| download | u-boot-30411e7cfc5a54856536881b893439dc158023a9.tar.gz u-boot-30411e7cfc5a54856536881b893439dc158023a9.tar.xz u-boot-30411e7cfc5a54856536881b893439dc158023a9.zip | |
powerpc: MPC8536DS: Remove macro CONFIG_MPC8536DS
Use CONFIG_TARGET_MPC8536DS instead.
Signed-off-by: York Sun <york.sun@nxp.com>
| -rw-r--r-- | board/freescale/common/Makefile | 2 | ||||
| -rw-r--r-- | board/freescale/common/pixis.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC8536DS.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile index c131ed9f9c..db36e53f1c 100644 --- a/board/freescale/common/Makefile +++ b/board/freescale/common/Makefile @@ -49,7 +49,7 @@ obj-$(CONFIG_MPC8541CDS) += cds_pci_ft.o obj-$(CONFIG_TARGET_MPC8548CDS) += cds_pci_ft.o obj-$(CONFIG_MPC8555CDS) += cds_pci_ft.o -obj-$(CONFIG_MPC8536DS) += ics307_clk.o +obj-$(CONFIG_TARGET_MPC8536DS) += ics307_clk.o obj-$(CONFIG_MPC8572DS) += ics307_clk.o obj-$(CONFIG_P1022DS) += ics307_clk.o obj-$(CONFIG_P2020DS) += ics307_clk.o diff --git a/board/freescale/common/pixis.h b/board/freescale/common/pixis.h index 29a2eeaf69..3c5915711c 100644 --- a/board/freescale/common/pixis.h +++ b/board/freescale/common/pixis.h @@ -7,7 +7,7 @@ #define __PIXIS_H_ 1 /* PIXIS register set. */ -#if defined(CONFIG_MPC8536DS) +#if defined(CONFIG_TARGET_MPC8536DS) typedef struct pixis { u8 id; u8 ver; diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index d6ef67f38a..446303d18b 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -40,7 +40,6 @@ /* High Level Configuration Options */ #define CONFIG_BOOKE 1 /* BOOKE */ #define CONFIG_E500 1 /* BOOKE e500 family */ -#define CONFIG_MPC8536DS 1 #define CONFIG_FSL_ELBC 1 /* Has Enhanced localbus controller */ #define CONFIG_PCI1 1 /* Enable PCI controller 1 */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2dcbb04f7c..142d71d13e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3140,7 +3140,6 @@ CONFIG_MPC83XX_GPIO_1_INIT_OPEN_DRAIN CONFIG_MPC83XX_GPIO_1_INIT_VALUE CONFIG_MPC83XX_PCI2 CONFIG_MPC850 -CONFIG_MPC8536DS CONFIG_MPC8540 CONFIG_MPC8540ADS CONFIG_MPC8541 |