From 04b9b92952d0e9f4b520fa9f1512daf5608f080b Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Fri, 16 Oct 2009 16:39:40 +0000 Subject: [PATCH] Drop unused and useless CONFIG_MAX_PCI_BUSES. It was added by rsmith in r2273 on 20060424, when pci_locate_device() in src/arch/i386/include/arch/romcc_io.h in fact scanned all busses: - for(; dev <= PCI_DEV(255, 31, 7); dev += PCI_DEV(0,0,1)) { + for(; dev <= PCI_DEV(CONFIG_MAX_PCI_BUSES, 31, 7); dev += PCI_DEV(0,0,1)) { Today this looks like: for(; dev <= PCI_DEV(255|(((1< Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4789 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/config/Options.lb | 5 ----- src/mainboard/bcom/winnetp680/Options.lb | 8 -------- src/mainboard/jetway/j7f24/Options.lb | 8 -------- src/mainboard/via/epia-cn/Options.lb | 7 ------- src/mainboard/via/epia-m/Options.lb | 10 ---------- src/mainboard/via/epia-m700/Options.lb | 8 -------- src/mainboard/via/epia-n/Options.lb | 7 ------- src/mainboard/via/pc2500e/Options.lb | 2 -- src/mainboard/via/vt8454c/Options.lb | 10 ---------- 9 files changed, 65 deletions(-) diff --git a/src/config/Options.lb b/src/config/Options.lb index d264c5985e..913fcb13cf 100644 --- a/src/config/Options.lb +++ b/src/config/Options.lb @@ -562,11 +562,6 @@ define CONFIG_SYS_CLK_FREQ export used comment "System clock frequency in MHz" end -define CONFIG_MAX_PCI_BUSES - default 255 - export always - comment "Maximum number of PCI buses to search for devices" -end define CONFIG_EPIA_VT8237R_INIT default none export used diff --git a/src/mainboard/bcom/winnetp680/Options.lb b/src/mainboard/bcom/winnetp680/Options.lb index 255fd643a3..d47d710f69 100644 --- a/src/mainboard/bcom/winnetp680/Options.lb +++ b/src/mainboard/bcom/winnetp680/Options.lb @@ -61,7 +61,6 @@ uses CONFIG_UDELAY_TSC uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_VIDEO_MB uses CONFIG_IOAPIC @@ -93,11 +92,4 @@ default CONFIG_CROSS_COMPILE = "" default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32 -fno-stack-protector" default HOSTCC = "gcc" -## -## Set this to the max PCI bus number you would ever use for PCI config I/O. -## Setting this number very high will make pci_locate_device() take a long -## time when it can't find a device. -## -default CONFIG_MAX_PCI_BUSES = 3 - end diff --git a/src/mainboard/jetway/j7f24/Options.lb b/src/mainboard/jetway/j7f24/Options.lb index b53a62f6d4..4db8ab2a3d 100644 --- a/src/mainboard/jetway/j7f24/Options.lb +++ b/src/mainboard/jetway/j7f24/Options.lb @@ -61,7 +61,6 @@ uses CONFIG_UDELAY_TSC uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_TTYS0_BAUD uses CONFIG_VIDEO_MB uses CONFIG_IOAPIC @@ -94,11 +93,4 @@ default CONFIG_CROSS_COMPILE = "" default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32 -fno-stack-protector" default HOSTCC = "gcc" -## -## Set this to the max PCI bus number you would ever use for PCI config I/O. -## Setting this number very high will make pci_locate_device() take a long -## time when it can't find a device. -## -default CONFIG_MAX_PCI_BUSES = 3 - end diff --git a/src/mainboard/via/epia-cn/Options.lb b/src/mainboard/via/epia-cn/Options.lb index 700de54a8b..0a84596d4f 100644 --- a/src/mainboard/via/epia-cn/Options.lb +++ b/src/mainboard/via/epia-cn/Options.lb @@ -61,7 +61,6 @@ uses CONFIG_UDELAY_TSC uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_TTYS0_BAUD uses CONFIG_VIDEO_MB uses CONFIG_IOAPIC @@ -94,10 +93,4 @@ default CONFIG_CROSS_COMPILE = "" default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32 -fno-stack-protector" default HOSTCC = "gcc" -## -## Set this to the max PCI bus number you would ever use for PCI config I/O. -## Setting this number very high will make pci_locate_device() take a long -## time when it can't find a device. -## -default CONFIG_MAX_PCI_BUSES = 3 end diff --git a/src/mainboard/via/epia-m/Options.lb b/src/mainboard/via/epia-m/Options.lb index 901da5b21a..0cb2c61390 100644 --- a/src/mainboard/via/epia-m/Options.lb +++ b/src/mainboard/via/epia-m/Options.lb @@ -41,7 +41,6 @@ uses CONFIG_UDELAY_TSC uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_TTYS0_BAUD ## CONFIG_ROM_SIZE is the size of boot ROM that this board will use. @@ -127,15 +126,6 @@ default CONFIG_CROSS_COMPILE="" default CC="$(CONFIG_CROSS_COMPILE)gcc -m32" default HOSTCC="gcc" -## -## Set this to the max PCI bus number you -## would ever use for PCI config IO. -## Setting this number very high will make -## pci_locate_device take a long time when -## it can't find a device. -## -default CONFIG_MAX_PCI_BUSES = 5 - default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL=8 default CONFIG_DEFAULT_CONSOLE_LOGLEVEL=8 default CONFIG_CONSOLE_SERIAL8250=1 diff --git a/src/mainboard/via/epia-m700/Options.lb b/src/mainboard/via/epia-m700/Options.lb index 5aa8473ec2..fffa5502d7 100644 --- a/src/mainboard/via/epia-m700/Options.lb +++ b/src/mainboard/via/epia-m700/Options.lb @@ -59,7 +59,6 @@ uses CONFIG_UDELAY_TSC uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_TTYS0_BAUD uses CONFIG_VIDEO_MB uses CONFIG_IOAPIC @@ -136,11 +135,4 @@ default HOSTCC = "gcc" default CONFIG_DEFAULT_CONSOLE_LOGLEVEL = 9 default CONFIG_MAXIMUM_CONSOLE_LOGLEVEL = 9 -## -## Set this to the max PCI bus number you would ever use for PCI config I/O. -## Setting this number very high will make pci_locate_device() take a long -## time when it can't find a device. -## -default CONFIG_MAX_PCI_BUSES = 3 - end diff --git a/src/mainboard/via/epia-n/Options.lb b/src/mainboard/via/epia-n/Options.lb index 7d229c5302..8ed88cb771 100644 --- a/src/mainboard/via/epia-n/Options.lb +++ b/src/mainboard/via/epia-n/Options.lb @@ -64,7 +64,6 @@ uses CONFIG_UDELAY_TSC uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_TTYS0_BAUD uses CONFIG_VIDEO_MB uses CONFIG_IOAPIC @@ -109,10 +108,4 @@ default HOSTCC = "gcc" #default CONFIG_MAINBOARD = "EPIA-N" default CONFIG_HAVE_MAINBOARD_RESOURCES = 1 -## -## Set this to the max PCI bus number you would ever use for PCI config I/O. -## Setting this number very high will make pci_locate_device() take a long -## time when it can't find a device. -## -default CONFIG_MAX_PCI_BUSES = 3 end diff --git a/src/mainboard/via/pc2500e/Options.lb b/src/mainboard/via/pc2500e/Options.lb index c71e792e24..946d1aad2b 100644 --- a/src/mainboard/via/pc2500e/Options.lb +++ b/src/mainboard/via/pc2500e/Options.lb @@ -62,7 +62,6 @@ uses CONFIG_UDELAY_TSC uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_TTYS0_BAUD uses CONFIG_TTYS0_BASE uses CONFIG_TTYS0_LCS @@ -101,7 +100,6 @@ default CONFIG_ROM_PAYLOAD = 1 default CONFIG_CROSS_COMPILE = "" default CC = "$(CONFIG_CROSS_COMPILE)gcc -m32 -fno-stack-protector" default HOSTCC = "gcc" -default CONFIG_MAX_PCI_BUSES = 3 default CONFIG_CONSOLE_SERIAL8250 = 1 default CONFIG_TTYS0_BAUD = 115200 default CONFIG_TTYS0_BASE = 0x3f8 diff --git a/src/mainboard/via/vt8454c/Options.lb b/src/mainboard/via/vt8454c/Options.lb index 0d84d5f357..cb796caf97 100644 --- a/src/mainboard/via/vt8454c/Options.lb +++ b/src/mainboard/via/vt8454c/Options.lb @@ -72,7 +72,6 @@ uses CONFIG_UDELAY_TSC uses CONFIG_TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 uses CONFIG_PCI_ROM_RUN uses CONFIG_CONSOLE_VGA -uses CONFIG_MAX_PCI_BUSES uses CONFIG_SMP uses CONFIG_IOAPIC @@ -184,15 +183,6 @@ default CONFIG_CROSS_COMPILE="" default CC="$(CONFIG_CROSS_COMPILE)gcc -m32" default HOSTCC="gcc" -## -## Set this to the max PCI bus number you -## would ever use for PCI config IO. -## Setting this number very high will make -## pci_locate_device take a long time when -## it can't find a device. -## -default CONFIG_MAX_PCI_BUSES = 0x80 - ## ## Disable the gdb stub by default ##