mpc83xx: because CONFIG_83XX_GENERIC_PCI is now synonymous with CONFIG_PCI, we remove the former
PATCH 1/1 mpc83xx: because CONFIG_83XX_GENERIC_PCI is now synonymous with CONFIG_PCI, we remove the former
..and its PCIE variant.
Signed-off-by Kim Phillips <[email protected]>
--- cpu/mpc83xx/Makefile | 4 ++-- include/configs/MPC8313ERDB.h | 1 - include/configs/MPC8315ERDB.h | 3 +-- include/configs/MPC8323ERDB.h | 1 - include/configs/MPC832XEMDS.h | 1 - include/configs/MPC8349EMDS.h | 4 ---- include/configs/MPC8349ITX.h | 1 - include/configs/MPC8360EMDS.h | 1 - include/configs/MPC8360ERDK.h | 1 - include/configs/MPC837XEMDS.h | 3 +-- include/configs/MPC837XERDB.h | 3 +-- include/configs/MVBLM7.h | 1 - include/configs/SIMPC8313.h | 1 - include/configs/TQM834x.h | 1 - include/configs/sbc8349.h | 1 - 15 files changed, 5 insertions(+), 22 deletions(-)
cpu/mpc83xx/Makefile +2 -2
@@ -38,8 +38,8 @@ COBJS-y += spd_sdram.o COBJS-y += ecc.o COBJS-$(CONFIG_QE) += qe_io.o COBJS-$(CONFIG_FSL_SERDES) += serdes.o -COBJS-$(CONFIG_83XX_GENERIC_PCI) += pci.o -COBJS-$(CONFIG_83XX_GENERIC_PCIE) += pcie.o +COBJS-$(CONFIG_PCI) += pci.o +COBJS-$(CONFIG_PCIE) += pcie.o COBJS-$(CONFIG_OF_LIBFDT) += fdt.o COBJS := $(COBJS-y)
include/configs/MPC8313ERDB.h +0 -1
@@ -36,7 +36,6 @@#define CONFIG_MPC8313ERDB 1#define CONFIG_PCI -#define CONFIG_83XX_GENERIC_PCI #define CONFIG_MISC_INIT_R
include/configs/MPC8315ERDB.h +1 -2
@@ -332,8 +332,7 @@#define CONFIG_SYS_PCIE2_IO_SIZE 0x00800000#define CONFIG_PCI -#define CONFIG_83XX_GENERIC_PCI 1/* Use generic PCI setup */ -#define CONFIG_83XX_GENERIC_PCIE 1 +#define CONFIG_PCIE #define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */
include/configs/MPC8323ERDB.h +0 -1
@@ -18,7 +18,6 @@#define CONFIG_MPC832x 1/* MPC832x CPU specific */ #define CONFIG_PCI 1 -#define CONFIG_83XX_GENERIC_PCI 1/* * System Clock Setup
include/configs/MPC832XEMDS.h +0 -1
@@ -334,7 +334,6 @@#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ -#define CONFIG_83XX_GENERIC_PCI #define CONFIG_83XX_PCI_STREAMING #undef CONFIG_EEPRO100
include/configs/MPC8349EMDS.h +0 -4
@@ -38,9 +38,6 @@#define CONFIG_MPC8349 1/* MPC8349 specific */ #define CONFIG_MPC8349EMDS 1/* MPC8349EMDS board specific */ -#undef CONFIG_PCI -#undef CONFIG_MPC83XX_PCI2/* support for 2nd PCI controller */ -#define PCI_66M #ifdef PCI_66M #define CONFIG_83XX_CLKIN 66000000/* in Hz */
@@ -374,7 +371,6 @@#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ -#define CONFIG_83XX_GENERIC_PCI #define CONFIG_83XX_PCI_STREAMING #undef CONFIG_EEPRO100
include/configs/MPC8349ITX.h +0 -1
@@ -382,7 +382,6 @@ boards, we say we have two, but don't display a message if we find only one. */#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ -#define CONFIG_83XX_GENERIC_PCI #ifndef CONFIG_PCI_PNP #define PCI_ENET0_IOADDR 0x00000000
include/configs/MPC8360EMDS.h +0 -1
@@ -369,7 +369,6 @@#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ -#define CONFIG_83XX_GENERIC_PCI #define CONFIG_83XX_PCI_STREAMING #undef CONFIG_EEPRO100
include/configs/MPC8360ERDK.h +0 -1
@@ -277,7 +277,6 @@* Addresses are mapped 1-1. */ #define CONFIG_PCI -#define CONFIG_83XX_GENERIC_PCI 1#define CONFIG_SYS_PCI1_MEM_BASE 0x80000000#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE
include/configs/MPC837XEMDS.h +1 -2
@@ -381,8 +381,7 @@#ifndef __ASSEMBLY__extern int board_pci_host_broken (void );#endif -#define CONFIG_83XX_GENERIC_PCI 1/* Use generic PCI setup */ -#define CONFIG_83XX_GENERIC_PCIE 1 +#define CONFIG_PCIE #define CONFIG_PQ_MDS_PIB 1/* PQ MDS Platform IO Board */ #define CONFIG_HAS_FSL_DR_USB 1/* fixup device tree for the DR USB */
include/configs/MPC837XERDB.h +1 -2
@@ -49,8 +49,7 @@#define CONFIG_83XX_PCICLK 66666667/* in HZ */ #else #define CONFIG_83XX_CLKIN 66666667/* in Hz */ -#define CONFIG_83XX_GENERIC_PCI 1 -#define CONFIG_83XX_GENERIC_PCIE 1 +#define CONFIG_PCIE #endif #ifndef CONFIG_SYS_CLK_FREQ
include/configs/MVBLM7.h +0 -1
@@ -40,7 +40,6 @@#define CONFIG_SYS_IMMR 0xE0000000#define CONFIG_PCI -#define CONFIG_83XX_GENERIC_PCI #define CONFIG_PCI_SKIP_HOST_BRIDGE #define CONFIG_HARD_I2C #define CONFIG_TSEC_ENET
include/configs/SIMPC8313.h +0 -1
@@ -37,7 +37,6 @@#define CONFIG_MPC8313 1#define CONFIG_PCI -#define CONFIG_83XX_GENERIC_PCI #define CONFIG_MISC_INIT_R
include/configs/TQM834x.h +0 -1
@@ -247,7 +247,6 @@ extern int tqm834x_num_flash_banks;#if defined(CONFIG_PCI )#define CONFIG_PCI_PNP /* do pci plug-and-play */ -#define CONFIG_83XX_GENERIC_PCI #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ /* PCI1 host bridge */
include/configs/sbc8349.h +0 -1
@@ -329,7 +329,6 @@#define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ -#define CONFIG_83XX_GENERIC_PCI #undef CONFIG_EEPRO100#undef CONFIG_TULIP
Signature · 1 line
1.6.3.3
Kim Phillips
AppliedPATCH 1/1 mpc83xx: because CONFIG_83XX_GENERIC_PCI is now synonymous with CONFIG_PCI, we remove the former
Quoted 4 lines · On Fri, 24 Jul 2009 12:22:02 -0500 Kim Phillips <[email protected]>…
..and its PCIE variant.
Signed-off-by Kim Phillips <[email protected]>---
applied, thanks.
Kim