diff options
author | Edwin Beasant <edwin_beasant@virtensys.com> | 2010-07-06 21:05:04 +0000 |
---|---|---|
committer | Myles Watson <mylesgw@gmail.com> | 2010-07-06 21:05:04 +0000 |
commit | eb50c7d922e91f0247b3705eccb2d2eec638c277 (patch) | |
tree | 2def570d089b2f6deb2beac165e18756a578e308 /src/mainboard/emulation/qemu-x86 | |
parent | 8376831eafc1be1175529fd21e0d2fe40339d4eb (diff) | |
download | coreboot-eb50c7d922e91f0247b3705eccb2d2eec638c277.tar.xz |
Re-integrate "USE_OPTION_TABLE" code.
Signed-off-by: Edwin Beasant <edwin_beasant@virtensys.com>
Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5653 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/emulation/qemu-x86')
-rw-r--r-- | src/mainboard/emulation/qemu-x86/Kconfig | 1 | ||||
-rw-r--r-- | src/mainboard/emulation/qemu-x86/romstage.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mainboard/emulation/qemu-x86/Kconfig b/src/mainboard/emulation/qemu-x86/Kconfig index 27a334d073..72f3c273c6 100644 --- a/src/mainboard/emulation/qemu-x86/Kconfig +++ b/src/mainboard/emulation/qemu-x86/Kconfig @@ -3,6 +3,7 @@ config BOARD_EMULATION_QEMU_X86 select ARCH_X86 select SOUTHBRIDGE_INTEL_I82371EB select ROMCC + select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select BOARD_ROMSIZE_KB_256 select WARNINGS_ARE_ERRORS diff --git a/src/mainboard/emulation/qemu-x86/romstage.c b/src/mainboard/emulation/qemu-x86/romstage.c index 7460a7bde1..6f78dea968 100644 --- a/src/mainboard/emulation/qemu-x86/romstage.c +++ b/src/mainboard/emulation/qemu-x86/romstage.c @@ -5,8 +5,7 @@ #include <device/pnp_def.h> #include <arch/romcc_io.h> #include <arch/hlt.h> -#include "option_table.h" -#include "pc80/mc146818rtc_early.c" +#include <pc80/mc146818rtc.h> #include <console/console.h> #include "pc80/udelay_io.c" #include "lib/delay.c" |