diff options
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/pci.c | 2 | ||||
| -rw-r--r-- | board/freescale/common/Makefile | 2 | ||||
| -rw-r--r-- | include/configs/MPC8541CDS.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/pci.c b/arch/powerpc/cpu/mpc85xx/pci.c index c6d2fda..bf003a7 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_MPC8541CDS) +#if defined(CONFIG_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 db36e53..e01df42 100644 --- a/board/freescale/common/Makefile +++ b/board/freescale/common/Makefile @@ -45,7 +45,7 @@ endif obj-$(CONFIG_FSL_DCU_SII9022A) += dcu_sii9022a.o -obj-$(CONFIG_MPC8541CDS) += cds_pci_ft.o +obj-$(CONFIG_TARGET_MPC8541CDS) += cds_pci_ft.o obj-$(CONFIG_TARGET_MPC8548CDS) += cds_pci_ft.o obj-$(CONFIG_MPC8555CDS) += cds_pci_ft.o diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 2bee0d0..29bca4c 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.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_MPC8541CDS 1 /* MPC8541CDS board specific */ #define CONFIG_SYS_TEXT_BASE 0xfff80000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5fd297e..1284101 100644 --- 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_MPC8541CDS CONFIG_MPC855 CONFIG_MPC8555 CONFIG_MPC8555CDS |