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

Add Kconfig support for PCI option ROMS. 

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4609 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Myles Watson 2009-08-28 14:36:12 +00:00
parent 876d7e9658
commit e6804955c4
7 changed files with 47 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -215,6 +215,7 @@ printall:
OBJS := $(patsubst %,$(obj)/%,$(TARGETS-y))
INCLUDES := -I$(top)/src -I$(top)/src/include -I$(obj) -I$(top)/src/arch/$(ARCHDIR-y)/include
INCLUDES += -I$(shell $(CC) -print-search-dirs | head -n 1 | cut -d' ' -f2)include
INCLUDES += -I$(top)/util/x86emu/include
INCLUDES += -include $(obj)/build.h
try-run= $(shell set -e; \

44
src/devices/Kconfig
View File

@ -21,35 +21,45 @@
menu "Devices"
config VGA_ROM_RUN
bool
bool "Run VGA Option ROMs"
help
Execute PCI/AGP option ROMs if available. This is required to
enable PCI/AGP VGA plugin cards.
Execute VGA option ROMs if found. This is required to enable PCI/AGP
VGA plugin cards.
config PCI_ROM_RUN
bool "Run non-VGA Option ROMs"
help
Execute non-VGA PCI option ROMs if found.
choice
prompt "Execute PCI option ROMs"
prompt "Option ROM Execution"
default PCI_OPTION_ROM_RUN_REALMODE
depends on PCI_ROM_RUN || VGA_ROM_RUN
help
Execute PCI/AGP option ROMs if available. You can choose to
execute PCI option ROMs natively (32bit x86 system required),
in an emulator (x86emu), or ignore option ROM execution.
You can choose to execute PCI option ROMs natively (32bit x86 system
required) or in an emulator (x86emu or YABEL).
config PCI_OPTION_ROM_RUN_REALMODE
prompt "Run VGA ROMs"
config PCI_OPTION_ROM_RUN_REALMODE
prompt "Real mode"
bool
select VGA_ROM_RUN
help
Execute PCI/AGP option ROMs if available. This is required to
enable PCI/AGP VGA plugin cards.
config NO_RUN
prompt "Do NOT run VGA ROMs"
config PCI_OPTION_ROM_RUN_YABEL
prompt "YABEL"
bool
help
Do not execute PCI/AGP option ROMs.
config PCI_OPTION_ROM_RUN_X86EMU
prompt "X86EMU"
bool
endchoice
config YABEL_DEBUG_FLAGS
prompt "Hex value for debug flags"
hex
default 0x0
depends on PCI_OPTION_ROM_RUN_YABEL
help
See debug.h for values 0 is no debug output, 0x31ff is _verbose_.
endmenu
config PCI_64BIT_PREF_MEM

4
src/devices/Makefile.inc
View File

@ -12,8 +12,8 @@ obj-y += pci_ops.o
obj-y += smbus_ops.o
ifeq ($(CONFIG_PCI_ROM_RUN),y)
obj-$(CONFIG_PCI_ROM_RUN) += pci_rom.o
subdirs-$(CONFIG_PCI_ROM_RUN) += ../../util/x86emu
obj-y += pci_rom.o
subdirs-y += ../../util/x86emu
else
obj-$(CONFIG_VGA_ROM_RUN) += pci_rom.o
subdirs-$(CONFIG_VGA_ROM_RUN) += ../../util/x86emu

5
util/x86emu/Makefile.inc
View File

@ -19,9 +19,12 @@
##
subdirs-$(CONFIG_PCI_OPTION_ROM_RUN_X86EMU) += x86emu
obj-$(CONFIG_PCI_OPTION_ROM_RUN_X86EMU) += biosemu.c
obj-$(CONFIG_PCI_OPTION_ROM_RUN_X86EMU) += biosemu.o
subdirs-$(CONFIG_PCI_OPTION_ROM_RUN_X86EMU) += pcbios
obj-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86.o
obj-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_asm.o
obj-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86_interrupts.o
subdirs-$(CONFIG_PCI_OPTION_ROM_RUN_YABEL) += x86emu
subdirs-$(CONFIG_PCI_OPTION_ROM_RUN_YABEL) += yabel

8
util/x86emu/yabel/Makefile.inc Normal file
View File

@ -0,0 +1,8 @@
obj-y += biosemu.o
obj-y += debug.o
obj-y += device.o
obj-y += interrupt.o
obj-y += io.o
obj-y += mem.o
obj-y += pmm.o
subdirs-y += compat

2
util/x86emu/yabel/biosemu.c
View File

@ -56,8 +56,6 @@ static X86EMU_pioFuncs my_pio_funcs = {
/* interrupt function override array (see biosemu.h) */
yabel_handleIntFunc yabel_intFuncArray[256];
void dump(u8 * addr, u32 len);
/* main entry into YABEL biosemu, arguments are:
* *biosmem = pointer to virtual memory
* biosmem_size = size of the virtual memory

1
util/x86emu/yabel/compat/Makefile.inc Normal file
View File

@ -0,0 +1 @@
obj-y += functions.o