summaryrefslogtreecommitdiff
path: root/board/emulation
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-08-04 12:34:03 -0600
committerSimon Glass <sjg@chromium.org>2015-08-05 08:44:08 -0600
commiteeae5100071465f67d203dd78ceb5a35de1b5717 (patch)
treec295a9763d2c2ca89868ee6a74aae0554d12f914 /board/emulation
parentb4302582f309b49a08c770960a37af6fe1f3afb3 (diff)
x86: qemu: Support operation as an EFI payload
Disable a few things which interfere with the EFI init. This allows QEMU to to boot into EFI, load a U-Boot payload then boot to the U-Boot prompt. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'board/emulation')
-rw-r--r--board/emulation/qemu-x86/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/board/emulation/qemu-x86/Kconfig b/board/emulation/qemu-x86/Kconfig
index e777ef44090..c9181fc1bf2 100644
--- a/board/emulation/qemu-x86/Kconfig
+++ b/board/emulation/qemu-x86/Kconfig
@@ -13,11 +13,12 @@ config SYS_CONFIG_NAME
default "qemu-x86"
config SYS_TEXT_BASE
- default 0xfff00000
+ default 0xfff00000 if !EFI_STUB
+ default 0x01110000 if EFI_STUB
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
- select X86_RESET_VECTOR
+ select X86_RESET_VECTOR if !EFI_STUB
select QEMU
select BOARD_ROMSIZE_KB_1024