diff options
author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2009-03-01 10:08:06 +0000 |
---|---|---|
committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2009-03-01 10:08:06 +0000 |
commit | be57458c77a5675d676859fb32031babb609c8a8 (patch) | |
tree | ce5b4bf4983329fbabd7898c339723b53d207d71 /util/x86emu/yabel/mem.c | |
parent | cc295dd73a20f340cfab7e82a0a1d2a0a3b37edf (diff) | |
download | coreboot-be57458c77a5675d676859fb32031babb609c8a8.tar.gz coreboot-be57458c77a5675d676859fb32031babb609c8a8.tar.bz2 coreboot-be57458c77a5675d676859fb32031babb609c8a8.zip |
This patch contains the necessary changes to util/x86emu of the v3 tree to use
it in the v2 tree as well. Requires the yabel-prereq.diff patch in order to
work in v2.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Joseph Smith <joe@settoplinux.org>
git-svn-id: svn://coreboot.org/repository/coreboot-v3@1141 f3766cd6-281f-0410-b1cd-43a5c92072e9
Diffstat (limited to 'util/x86emu/yabel/mem.c')
-rw-r--r-- | util/x86emu/yabel/mem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/util/x86emu/yabel/mem.c b/util/x86emu/yabel/mem.c index 0f653e968d0c..af096bf3e5a2 100644 --- a/util/x86emu/yabel/mem.c +++ b/util/x86emu/yabel/mem.c @@ -11,12 +11,18 @@ *****************************************************************************/ #include <types.h> +#if !COREBOOT_V2 #include <cpu.h> +#endif #include "debug.h" #include "device.h" #include "x86emu/x86emu.h" #include "biosemu.h" +#if COREBOOT_V2 +#include "compat/time.h" +#else #include <time.h> +#endif // define a check for access to certain (virtual) memory regions (interrupt handlers, BIOS Data Area, ...) #ifdef DEBUG |