powerpc: MPC8555CDS: Remove macro CONFIG_MPC8555CDS

Use CONFIG_TARGET_MPC8555CDS instead.

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

diff --git a/arch/powerpc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c
index bf003a7781a08c3e20119ccff5bdff24bf521c18..538729f38879c2f8957ca5024f0cdc6d2acf15d0 100644 (file)
--- a/arch/powerpc/cpu/mpc85xx/pci.c
+++ b/arch/powerpc/cpu/mpc85xx/pci.c
@@ -120,7 +120,7 @@ pci_mpc85xx_init(struct pci_controller *board_hose)
 
        pci_register_hose(hose);
 
-#if defined(CONFIG_MPC8555CDS) || defined(CONFIG_TARGET_MPC8541CDS)
+#if defined(CONFIG_TARGET_MPC8555CDS) || defined(CONFIG_TARGET_MPC8541CDS)
        /*
         * This is a SW workaround for an apparent HW problem
         * in the PCI controller on the MPC85555/41 CDS boards.

diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile
index e01df42ff7e53f65ea2023cf9cd1965d0361d619..06ce3111c3811fc8ec856187c9186a45f6158a27 100644 (file)
--- a/board/freescale/common/Makefile
+++ b/board/freescale/common/Makefile
@@ -47,7 +47,7 @@ obj-$(CONFIG_FSL_DCU_SII9022A)    += dcu_sii9022a.o
 
 obj-$(CONFIG_TARGET_MPC8541CDS)        += cds_pci_ft.o
 obj-$(CONFIG_TARGET_MPC8548CDS)        += cds_pci_ft.o
-obj-$(CONFIG_MPC8555CDS)       += 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

diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h
index d0498c63d2bae811886442d322f773630195a6b2..3cf8d97b418a0cc74ff1754d53077c6cae80e27c 100644 (file)
--- a/include/configs/MPC8555CDS.h
+++ b/include/configs/MPC8555CDS.h
@@ -17,7 +17,6 @@
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
 #define CONFIG_CPM2            1       /* has CPM2 */
-#define CONFIG_MPC8555CDS      1       /* MPC8555CDS board specific */
 
 #define        CONFIG_SYS_TEXT_BASE    0xfff80000
 

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index aa7dcc8ec7094eaf8dba0a45cbe6e7e4148d1a96..39507d3ca70f90bc828ae877f9c2b9fceef81374 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3141,7 +3141,6 @@ CONFIG_MPC83XX_GPIO_1_INIT_VALUE
 CONFIG_MPC83XX_PCI2
 CONFIG_MPC850
 CONFIG_MPC855
-CONFIG_MPC8555CDS
 CONFIG_MPC8560
 CONFIG_MPC8560ADS
 CONFIG_MPC8568