diff options
| author | Tom Rini <trini@konsulko.com> | 2018-06-18 12:59:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-18 12:59:46 -0400 |
| commit | 378b29cbc6607ad8246b1381bc74ec62bdb19105 (patch) | |
| tree | 18232d99d78af022062bdbe36f8253e41d017d4a /arch/x86/cpu/qemu | |
| parent | 103c45fb0daab924308046454b4aaad4a09237c4 (diff) | |
| parent | 0102023966558075e52758bd22ffd8f96b093a7e (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu/qemu')
| -rw-r--r-- | arch/x86/cpu/qemu/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/cpu/qemu/qemu.c | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/cpu/qemu/Makefile b/arch/x86/cpu/qemu/Makefile index e5ea92545e3..17612441789 100644 --- a/arch/x86/cpu/qemu/Makefile +++ b/arch/x86/cpu/qemu/Makefile @@ -2,8 +2,6 @@ # # Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com> -ifndef CONFIG_EFI_STUB obj-y += car.o dram.o -endif obj-y += qemu.o obj-$(CONFIG_QFW) += cpu.o e820.o diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index 1fdb11cc60c..ca4b3f08335 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -143,10 +143,6 @@ int arch_cpu_init(void) return x86_cpu_init_f(); } -#endif - -#if !CONFIG_IS_ENABLED(EFI_STUB) && \ - !CONFIG_IS_ENABLED(SPL_X86_32BIT_INIT) int checkcpu(void) { |