diff options
| author | Simon Glass <sjg@chromium.org> | 2015-08-04 18:34:03 (GMT) |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-08-05 14:44:08 (GMT) |
| commit | eeae5100071465f67d203dd78ceb5a35de1b5717 (patch) | |
| tree | c295a9763d2c2ca89868ee6a74aae0554d12f914 /arch/x86/cpu | |
| parent | b4302582f309b49a08c770960a37af6fe1f3afb3 (diff) | |
| download | u-boot-eeae5100071465f67d203dd78ceb5a35de1b5717.tar.xz | |
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 'arch/x86/cpu')
| -rw-r--r-- | arch/x86/cpu/qemu/Makefile | 5 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/qemu.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/cpu/qemu/Makefile b/arch/x86/cpu/qemu/Makefile index be79723..9a66b16 100644 --- a/arch/x86/cpu/qemu/Makefile +++ b/arch/x86/cpu/qemu/Makefile @@ -4,5 +4,8 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += car.o dram.o qemu.o +ifndef CONFIG_EFI_STUB +obj-y += car.o dram.o +endif +obj-y += qemu.o obj-$(CONFIG_PCI) += pci.o diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index 930d2b6..64634a9 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -25,11 +25,13 @@ int arch_cpu_init(void) return 0; } +#ifndef CONFIG_EFI_STUB int print_cpuinfo(void) { post_code(POST_CPU_INFO); return default_print_cpuinfo(); } +#endif void reset_cpu(ulong addr) { |