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 06ce3111c3811fc8ec856187c9186a45f6158a27..7e8587ce805a3f10ab929ea86f928e430b4ac637 100644 (file)
--- 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 3c5915711c9095ae01236e70ad0907c2b946ac04..df3cc09b9c205019aeca2ee585e0943d916ccebf 100644 (file)
--- 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 36d2ecce9df72b46d93c951a5551b530a238a490..e1345609782854c5f230b11cccf29b12c62179fa 100644 (file)
--- 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 ecf15b859057ae30daeda796c4299f7b0f6a7ffc..db34894207afbc7a76b5bfbfa5d8dcee5a12734e 100644 (file)
--- 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