From: York Sun <york.sun@nxp.com>
Date: Wed, 16 Nov 2016 19:09:07 +0000 (-0800)
Subject: powerpc: MPC8536DS: Remove macro CONFIG_MPC8536DS
X-Git-Tag: v2017.01-rc1~157^2~85
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=30411e7cfc5a54856536881b893439dc158023a9;p=oweals%2Fu-boot.git

powerpc: MPC8536DS: Remove macro CONFIG_MPC8536DS

Use CONFIG_TARGET_MPC8536DS instead.

Signed-off-by: York Sun <york.sun@nxp.com>
---

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