On Fri, Oct 16, 2009 at 05:04:52PM +0200, Peter Stuge wrote:
> ron minnich wrote:
> > I doubt we need it any more.
>
> Thanks for the explanations, Myles and Ron! See patch.
>
>
> //Peter
> Drop 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<<CONFIG_PCI_BUS_SEGN_BITS)-1)<<8), 31, 7);
> dev += PCI_DEV(0,0,1)) {
>
> and CONFIG_MAX_PCI_BUSES is never used anywhere.
>
> Signed-off-by: Peter Stuge <[email protected]>
Looks like you were faster, but here's my patch nonetheless.
It removeѕ some additional useless comments. Also, the change in
src/config/Options.lb is not correct and will likely break the build.
> Index: src/config/Options.lb
> ===================================================================
> --- src/config/Options.lb (revision 4787)
> +++ src/config/Options.lb (working copy)
> @@ -562,7 +562,6 @@
> 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"
Uwe.
--
http://www.hermann-uwe.de | http://www.randomprojects.org
http://www.crazy-hacks.org | http://www.unmaintained-free-software.org
Drop unused and useless CONFIG_MAX_PCI_BUSES.
Signed-off-by: Uwe Hermann <[email protected]>
Index: src/mainboard/bcom/winnetp680/Options.lb
===================================================================
--- src/mainboard/bcom/winnetp680/Options.lb (Revision 4786)
+++ src/mainboard/bcom/winnetp680/Options.lb (Arbeitskopie)
@@ -61,7 +61,6 @@
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 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
Index: src/mainboard/via/epia-m700/Options.lb
===================================================================
--- src/mainboard/via/epia-m700/Options.lb (Revision 4786)
+++ src/mainboard/via/epia-m700/Options.lb (Arbeitskopie)
@@ -59,7 +59,6 @@
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 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
Index: src/mainboard/via/vt8454c/Options.lb
===================================================================
--- src/mainboard/via/vt8454c/Options.lb (Revision 4786)
+++ src/mainboard/via/vt8454c/Options.lb (Arbeitskopie)
@@ -72,7 +72,6 @@
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
@@ -185,15 +184,6 @@
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
##
default CONFIG_GDB_STUB=0
Index: src/mainboard/via/epia-m/Options.lb
===================================================================
--- src/mainboard/via/epia-m/Options.lb (Revision 4786)
+++ src/mainboard/via/epia-m/Options.lb (Arbeitskopie)
@@ -41,7 +41,6 @@
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 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
Index: src/mainboard/via/epia-n/Options.lb
===================================================================
--- src/mainboard/via/epia-n/Options.lb (Revision 4786)
+++ src/mainboard/via/epia-n/Options.lb (Arbeitskopie)
@@ -64,7 +64,6 @@
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 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
Index: src/mainboard/via/epia-cn/Options.lb
===================================================================
--- src/mainboard/via/epia-cn/Options.lb (Revision 4786)
+++ src/mainboard/via/epia-cn/Options.lb (Arbeitskopie)
@@ -61,7 +61,6 @@
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 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
Index: src/mainboard/via/pc2500e/Options.lb
===================================================================
--- src/mainboard/via/pc2500e/Options.lb (Revision 4786)
+++ src/mainboard/via/pc2500e/Options.lb (Arbeitskopie)
@@ -62,7 +62,6 @@
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_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
Index: src/mainboard/jetway/j7f24/Options.lb
===================================================================
--- src/mainboard/jetway/j7f24/Options.lb (Revision 4786)
+++ src/mainboard/jetway/j7f24/Options.lb (Arbeitskopie)
@@ -61,7 +61,6 @@
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 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
Index: src/config/Options.lb
===================================================================
--- src/config/Options.lb (Revision 4786)
+++ src/config/Options.lb (Arbeitskopie)
@@ -562,11 +562,6 @@
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
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
