diff options
| author | Myles Watson <mylesgw@gmail.com> | 2010-06-04 15:55:12 +0000 |
|---|---|---|
| committer | Myles Watson <mylesgw@gmail.com> | 2010-06-04 15:55:12 +0000 |
| commit | e3df121e4f471e037a95db4a9349c3101dbf9f1b (patch) | |
| tree | d0e505b92b502810c1fb10933b30fb3c931af5f4 | |
| parent | c282a1876fe445ebee8f44aba3bc79c7d6e9453f (diff) | |
| download | coreboot-e3df121e4f471e037a95db4a9349c3101dbf9f1b.tar.xz | |
Enable PCI_OPTION_ROM_REALMODE when GEODE_VSA is selected.
Using YABEL isn't supported for the VSA, so don't allow a choice.
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5608 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
| -rw-r--r-- | src/devices/Kconfig | 3 | ||||
| -rw-r--r-- | src/devices/Makefile.inc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/devices/Kconfig b/src/devices/Kconfig index 151492d6c8..3d0049e28d 100644 --- a/src/devices/Kconfig +++ b/src/devices/Kconfig @@ -46,7 +46,7 @@ choice prompt "Option ROM execution type" default PCI_OPTION_ROM_RUN_YABEL if !ARCH_X86 default PCI_OPTION_ROM_RUN_REALMODE if ARCH_X86 - depends on PCI_ROM_RUN || VGA_ROM_RUN + depends on PCI_ROM_RUN || VGA_ROM_RUN || GEODE_VSA config PCI_OPTION_ROM_RUN_REALMODE prompt "Native mode" @@ -61,6 +61,7 @@ config PCI_OPTION_ROM_RUN_REALMODE config PCI_OPTION_ROM_RUN_YABEL prompt "Secure mode" bool + depends on !GEODE_VSA help If you select this option, the x86emu CPU emulator will be used to execute PCI option ROMs. diff --git a/src/devices/Makefile.inc b/src/devices/Makefile.inc index 4516401cc3..dd518bd16b 100644 --- a/src/devices/Makefile.inc +++ b/src/devices/Makefile.inc @@ -11,11 +11,11 @@ obj-y += pnp_device.o obj-y += pci_ops.o obj-y += smbus_ops.o +subdirs-y += oprom + ifeq ($(CONFIG_PCI_ROM_RUN),y) obj-y += pci_rom.o -subdirs-y += oprom else obj-$(CONFIG_VGA_ROM_RUN) += pci_rom.o -subdirs-$(CONFIG_VGA_ROM_RUN) += oprom endif |