GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mpc83xx: CONFIG_83XX_GENERIC_PCI is now synonymous with CONFIG_PCI; remove the former

Browse source 
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
This commit is contained in:
Kim Phillips 2009-07-23 14:09:38 -05:00
parent 94978e19f3
commit be9b56df02
15 changed files with 5 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cpu/mpc83xx/Makefile
View file

@ -38,8 +38,8 @@ COBJS-y += spd_sdram.o
COBJS-y += ecc.o COBJS-y += ecc.o
COBJS-$(CONFIG_QE) += qe_io.o COBJS-$(CONFIG_QE) += qe_io.o
COBJS-$(CONFIG_FSL_SERDES) += serdes.o COBJS-$(CONFIG_FSL_SERDES) += serdes.o
COBJS-$(CONFIG_83XX_GENERIC_PCI) += pci.o COBJS-$(CONFIG_PCI) += pci.o
COBJS-$(CONFIG_83XX_GENERIC_PCIE) += pcie.o COBJS-$(CONFIG_PCIE) += pcie.o
COBJS-$(CONFIG_OF_LIBFDT) += fdt.o COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
COBJS := $(COBJS-y) COBJS := $(COBJS-y)

1
include/configs/MPC8313ERDB.h
View file

@ -36,7 +36,6 @@
#define CONFIG_MPC8313ERDB 1 #define CONFIG_MPC8313ERDB 1
#define CONFIG_PCI #define CONFIG_PCI
#define CONFIG_83XX_GENERIC_PCI
#define CONFIG_MISC_INIT_R #define CONFIG_MISC_INIT_R

3
include/configs/MPC8315ERDB.h
View file

@ -332,8 +332,7 @@
#define CONFIG_SYS_PCIE2_IO_SIZE 0x00800000 #define CONFIG_SYS_PCIE2_IO_SIZE 0x00800000
#define CONFIG_PCI #define CONFIG_PCI
#define CONFIG_83XX_GENERIC_PCI 1 /* Use generic PCI setup */ #define CONFIG_PCIE
#define CONFIG_83XX_GENERIC_PCIE 1
#define CONFIG_NET_MULTI #define CONFIG_NET_MULTI
#define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_PCI_PNP /* do pci plug-and-play */

1
include/configs/MPC8323ERDB.h
View file

@ -18,7 +18,6 @@
#define CONFIG_MPC832x 1 /* MPC832x CPU specific */ #define CONFIG_MPC832x 1 /* MPC832x CPU specific */
#define CONFIG_PCI 1 #define CONFIG_PCI 1
#define CONFIG_83XX_GENERIC_PCI 1
/* /*
* System Clock Setup * System Clock Setup

1
include/configs/MPC832XEMDS.h
View file

@ -334,7 +334,6 @@
#define CONFIG_NET_MULTI #define CONFIG_NET_MULTI
#define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_83XX_GENERIC_PCI
#define CONFIG_83XX_PCI_STREAMING #define CONFIG_83XX_PCI_STREAMING
#undef CONFIG_EEPRO100 #undef CONFIG_EEPRO100

4
include/configs/MPC8349EMDS.h
View file

@ -38,9 +38,6 @@
#define CONFIG_MPC8349 1 /* MPC8349 specific */ #define CONFIG_MPC8349 1 /* MPC8349 specific */
#define CONFIG_MPC8349EMDS 1 /* MPC8349EMDS board specific */ #define CONFIG_MPC8349EMDS 1 /* MPC8349EMDS board specific */
#undef CONFIG_PCI
#undef CONFIG_MPC83XX_PCI2 /* support for 2nd PCI controller */
#define PCI_66M #define PCI_66M
#ifdef PCI_66M #ifdef PCI_66M
#define CONFIG_83XX_CLKIN 66000000 /* in Hz */ #define CONFIG_83XX_CLKIN 66000000 /* in Hz */
@ -374,7 +371,6 @@
#define CONFIG_NET_MULTI #define CONFIG_NET_MULTI
#define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_83XX_GENERIC_PCI
#define CONFIG_83XX_PCI_STREAMING #define CONFIG_83XX_PCI_STREAMING
#undef CONFIG_EEPRO100 #undef CONFIG_EEPRO100

1
include/configs/MPC8349ITX.h
View file

@ -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_NET_MULTI
#define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_83XX_GENERIC_PCI
#ifndef CONFIG_PCI_PNP #ifndef CONFIG_PCI_PNP
#define PCI_ENET0_IOADDR 0x00000000 #define PCI_ENET0_IOADDR 0x00000000

1
include/configs/MPC8360EMDS.h
View file

@ -369,7 +369,6 @@
#define CONFIG_NET_MULTI #define CONFIG_NET_MULTI
#define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_83XX_GENERIC_PCI
#define CONFIG_83XX_PCI_STREAMING #define CONFIG_83XX_PCI_STREAMING
#undef CONFIG_EEPRO100 #undef CONFIG_EEPRO100

1
include/configs/MPC8360ERDK.h
View file

@ -277,7 +277,6 @@
* Addresses are mapped 1-1. * Addresses are mapped 1-1.
*/ */
#define CONFIG_PCI #define CONFIG_PCI
#define CONFIG_83XX_GENERIC_PCI 1
#define CONFIG_SYS_PCI1_MEM_BASE 0x80000000 #define CONFIG_SYS_PCI1_MEM_BASE 0x80000000
#define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE #define CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_BASE

3
include/configs/MPC837XEMDS.h
View file

@ -381,8 +381,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
extern int board_pci_host_broken(void); extern int board_pci_host_broken(void);
#endif #endif
#define CONFIG_83XX_GENERIC_PCI 1 /* Use generic PCI setup */ #define CONFIG_PCIE
#define CONFIG_83XX_GENERIC_PCIE 1
#define CONFIG_PQ_MDS_PIB 1 /* PQ MDS Platform IO Board */ #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 */ #define CONFIG_HAS_FSL_DR_USB 1 /* fixup device tree for the DR USB */

3
include/configs/MPC837XERDB.h
View file

@ -49,8 +49,7 @@
#define CONFIG_83XX_PCICLK 66666667 /* in HZ */ #define CONFIG_83XX_PCICLK 66666667 /* in HZ */
#else #else
#define CONFIG_83XX_CLKIN 66666667 /* in Hz */ #define CONFIG_83XX_CLKIN 66666667 /* in Hz */
#define CONFIG_83XX_GENERIC_PCI 1 #define CONFIG_PCIE
#define CONFIG_83XX_GENERIC_PCIE 1
#endif #endif
#ifndef CONFIG_SYS_CLK_FREQ #ifndef CONFIG_SYS_CLK_FREQ

1
include/configs/MVBLM7.h
View file

@ -40,7 +40,6 @@
#define CONFIG_SYS_IMMR 0xE0000000 #define CONFIG_SYS_IMMR 0xE0000000
#define CONFIG_PCI #define CONFIG_PCI
#define CONFIG_83XX_GENERIC_PCI
#define CONFIG_PCI_SKIP_HOST_BRIDGE #define CONFIG_PCI_SKIP_HOST_BRIDGE
#define CONFIG_HARD_I2C #define CONFIG_HARD_I2C
#define CONFIG_TSEC_ENET #define CONFIG_TSEC_ENET

1
include/configs/SIMPC8313.h
View file

@ -37,7 +37,6 @@
#define CONFIG_MPC8313 1 #define CONFIG_MPC8313 1
#define CONFIG_PCI #define CONFIG_PCI
#define CONFIG_83XX_GENERIC_PCI
#define CONFIG_MISC_INIT_R #define CONFIG_MISC_INIT_R

1
include/configs/TQM834x.h
View file

@ -247,7 +247,6 @@ extern int tqm834x_num_flash_banks;
#if defined(CONFIG_PCI) #if defined(CONFIG_PCI)
#define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_83XX_GENERIC_PCI
#define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */
/* PCI1 host bridge */ /* PCI1 host bridge */

1
include/configs/sbc8349.h
View file

@ -329,7 +329,6 @@
#define CONFIG_NET_MULTI #define CONFIG_NET_MULTI
#define CONFIG_PCI_PNP /* do pci plug-and-play */ #define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_83XX_GENERIC_PCI
#undef CONFIG_EEPRO100 #undef CONFIG_EEPRO100
#undef CONFIG_TULIP #undef CONFIG_TULIP