diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-10-03 16:24:58 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-10-03 16:24:58 +0000 |
| commit | 6768f39a4b5a5d6d1c2318f632f801fe1c8084cd (patch) | |
| tree | 70ed41597c9cd4d19bec099a8ba403d48cdf4208 /src/devices/pci_rom.c | |
| parent | 8f3ec7b1a3771a317c2415e2366fa719582f29d1 (diff) | |
| download | coreboot-6768f39a4b5a5d6d1c2318f632f801fe1c8084cd.tar.xz | |
Remove:
- CONFIG_CBFS
- anything that's conditional on CONFIG_CBFS == 0
- files that were only included for CONFIG_CBFS == 0
In particular:
- elfboot
- stream boot code
- mini-filo and filesystems (depends on stream boot code)
After this commit, there is no way to build an image that is not using
CBFS anymore.
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4712 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices/pci_rom.c')
| -rw-r--r-- | src/devices/pci_rom.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/devices/pci_rom.c b/src/devices/pci_rom.c index f188bc7d1e..f64a9e8c55 100644 --- a/src/devices/pci_rom.c +++ b/src/devices/pci_rom.c @@ -35,22 +35,17 @@ struct rom_header * pci_rom_probe(struct device *dev) struct rom_header *rom_header; struct pci_data *rom_data; - if (CONFIG_CBFS) { - void *v; - /* if it's in FLASH, then it's as if dev->on_mainboard was true */ - v = cbfs_load_optionrom(dev->vendor, dev->device, NULL); - printk_debug("In cbfs, rom address for %s = %p\n", - dev_path(dev), v); - if (v) { - dev->rom_address = (u32)v; - dev->on_mainboard = 1; - } - } + void *v; + /* if it's in FLASH, then it's as if dev->on_mainboard was true */ + v = cbfs_load_optionrom(dev->vendor, dev->device, NULL); + printk_debug("In cbfs, rom address for %s = %p\n", + dev_path(dev), v); + if (v) { + dev->rom_address = (u32)v; + dev->on_mainboard = 1; + } if (dev->on_mainboard) { - /* this is here as a legacy path. We hope it goes away soon. Users should not have to - * compute the ROM address at build time! - */ // in case some device PCI_ROM_ADDRESS can not be set or readonly rom_address = dev->rom_address; printk_debug("On mainboard, rom address for %s = %lx\n", |