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

powerpc: MPC8572DS: Remove macro CONFIG_MPC8572DS

Use CONFIG_TARGET_MPC8572DS instead.

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

diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile
index 06ce3111c3..7e8587ce80 100644
--- a/board/freescale/common/Makefile
+++ b/board/freescale/common/Makefile
@@ -50,7 +50,7 @@ obj-$(CONFIG_TARGET_MPC8548CDS)	+= cds_pci_ft.o
 obj-$(CONFIG_TARGET_MPC8555CDS)	+= cds_pci_ft.o
 
 obj-$(CONFIG_TARGET_MPC8536DS)	+= ics307_clk.o
-obj-$(CONFIG_MPC8572DS)	+= ics307_clk.o
+obj-$(CONFIG_TARGET_MPC8572DS)	+= ics307_clk.o
 obj-$(CONFIG_P1022DS)		+= ics307_clk.o
 obj-$(CONFIG_P2020DS)		+= ics307_clk.o
 obj-$(CONFIG_P3041DS)		+= ics307_clk.o
diff --git a/board/freescale/common/pixis.h b/board/freescale/common/pixis.h
index 3c5915711c..df3cc09b9c 100644
--- a/board/freescale/common/pixis.h
+++ b/board/freescale/common/pixis.h
@@ -73,7 +73,7 @@ typedef struct pixis {
 	u8 res2[34];
 } __attribute__ ((packed)) pixis_t;
 
-#elif defined(CONFIG_MPC8572DS)
+#elif defined(CONFIG_TARGET_MPC8572DS)
 typedef struct pixis {
 	u8 id;
 	u8 ver;
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index 36d2ecce9d..e134560978 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -28,7 +28,6 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE		1	/* BOOKE */
 #define CONFIG_E500		1	/* BOOKE e500 family */
-#define CONFIG_MPC8572DS	1
 #define CONFIG_MP		1	/* support multiple processors */
 
 #define CONFIG_FSL_ELBC		1	/* Has Enhanced localbus controller */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index ecf15b8590..db34894207 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3142,7 +3142,6 @@ CONFIG_MPC83XX_PCI2
 CONFIG_MPC850
 CONFIG_MPC855
 CONFIG_MPC857
-CONFIG_MPC8572DS
 CONFIG_MPC85XX_FEC
 CONFIG_MPC85XX_FEC_NAME
 CONFIG_MPC85XX_PCI2