Author: myles Date: Fri Jun 4 17:55:12 2010 New Revision: 5608 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5608
Log: 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
Modified: trunk/src/devices/Kconfig trunk/src/devices/Makefile.inc
Modified: trunk/src/devices/Kconfig ============================================================================== --- trunk/src/devices/Kconfig Fri Jun 4 09:49:53 2010 (r5607) +++ trunk/src/devices/Kconfig Fri Jun 4 17:55:12 2010 (r5608) @@ -46,7 +46,7 @@ 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_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.
Modified: trunk/src/devices/Makefile.inc ============================================================================== --- trunk/src/devices/Makefile.inc Fri Jun 4 09:49:53 2010 (r5607) +++ trunk/src/devices/Makefile.inc Fri Jun 4 17:55:12 2010 (r5608) @@ -11,11 +11,11 @@ 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