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 c131ed9f9ccdfc7b351d3490f4b7e066f340178f..db36e53f1c79e29c83d50e444f17394539ae18e6 100644 (file)
--- 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 29a2eeaf697606e8dc8ee7e10f6cb5d3541f1f2f..3c5915711c9095ae01236e70ad0907c2b946ac04 100644 (file)
--- 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 d6ef67f38a0918a372735b5ba8f2e9caf35e4f4d..446303d18b94b77a0f82ba8909d8bc5301a11e53 100644 (file)
--- 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 2dcbb04f7cb71104e84dc033aeb34becc1a6fe64..142d71d13ed112d895ce3f6ed2b1a5744cf4aa79 100644 (file)
--- 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