GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Myles Watson 2010-06-04 15:55:12 +00:00
parent c282a1876f
commit e3df121e4f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/devices/Kconfig
View File

@ -46,7 +46,7 @@ choice
prompt "Option ROM execution type" prompt "Option ROM execution type"
default PCI_OPTION_ROM_RUN_YABEL if !ARCH_X86 default PCI_OPTION_ROM_RUN_YABEL if !ARCH_X86
default PCI_OPTION_ROM_RUN_REALMODE 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 config PCI_OPTION_ROM_RUN_REALMODE
prompt "Native mode" prompt "Native mode"
@ -61,6 +61,7 @@ config PCI_OPTION_ROM_RUN_REALMODE
config PCI_OPTION_ROM_RUN_YABEL config PCI_OPTION_ROM_RUN_YABEL
prompt "Secure mode" prompt "Secure mode"
bool bool
depends on !GEODE_VSA
help help
If you select this option, the x86emu CPU emulator will be used to If you select this option, the x86emu CPU emulator will be used to
execute PCI option ROMs. execute PCI option ROMs.

4
src/devices/Makefile.inc
View File

@ -11,11 +11,11 @@ obj-y += pnp_device.o
obj-y += pci_ops.o obj-y += pci_ops.o
obj-y += smbus_ops.o obj-y += smbus_ops.o
subdirs-y += oprom
ifeq ($(CONFIG_PCI_ROM_RUN),y) ifeq ($(CONFIG_PCI_ROM_RUN),y)
obj-y += pci_rom.o obj-y += pci_rom.o
subdirs-y += oprom
else else
obj-$(CONFIG_VGA_ROM_RUN) += pci_rom.o obj-$(CONFIG_VGA_ROM_RUN) += pci_rom.o
subdirs-$(CONFIG_VGA_ROM_RUN) += oprom
endif endif