From: York Sun Date: Wed, 16 Nov 2016 19:24:45 +0000 (-0800) Subject: powerpc: MPC8555CDS: Remove macro CONFIG_MPC8555CDS X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2f2d54b7cdeca694585f080bd4ef66b4b796f7d3;p=project%2Fbcm63xx%2Fu-boot.git powerpc: MPC8555CDS: Remove macro CONFIG_MPC8555CDS Use CONFIG_TARGET_MPC8555CDS instead. Signed-off-by: York Sun --- diff --git a/arch/powerpc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c index bf003a7781..538729f388 100644 --- 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 e01df42ff7..06ce3111c3 100644 --- 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 d0498c63d2..3cf8d97b41 100644 --- 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 aa7dcc8ec7..39507d3ca7 100644 --- 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