From patchwork Fri Oct 16 15:04:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Drop MAX_PCI_BUSES Date: Fri, 16 Oct 2009 15:04:52 -0000 From: Peter Stuge X-Patchwork-Id: 422 Message-Id: <20091016150452.5952.qmail@stuge.se> To: coreboot@coreboot.org 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< Acked-by: Ronald G. Minnich Acked-by: Peter Stuge Index: src/mainboard/bcom/winnetp680/Options.lb =================================================================== --- src/mainboard/bcom/winnetp680/Options.lb (revision 4787) +++ src/mainboard/bcom/winnetp680/Options.lb (working copy) @@ -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 @@ -98,6 +97,5 @@ ## 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 4787) +++ src/mainboard/via/epia-m700/Options.lb (working copy) @@ -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 @@ -141,6 +140,5 @@ ## 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 4787) +++ src/mainboard/via/vt8454c/Options.lb (working copy) @@ -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 @@ -191,7 +190,6 @@ ## 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 Index: src/mainboard/via/epia-m/Options.lb =================================================================== --- src/mainboard/via/epia-m/Options.lb (revision 4787) +++ src/mainboard/via/epia-m/Options.lb (working copy) @@ -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. @@ -134,7 +133,6 @@ ## 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 Index: src/mainboard/via/epia-n/Options.lb =================================================================== --- src/mainboard/via/epia-n/Options.lb (revision 4787) +++ src/mainboard/via/epia-n/Options.lb (working copy) @@ -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 @@ -114,5 +113,4 @@ ## 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 4787) +++ src/mainboard/via/epia-cn/Options.lb (working copy) @@ -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 @@ -99,5 +98,4 @@ ## 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 4787) +++ src/mainboard/via/pc2500e/Options.lb (working copy) @@ -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 4787) +++ src/mainboard/jetway/j7f24/Options.lb (working copy) @@ -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 @@ -99,6 +98,5 @@ ## 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 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"