diff options
author | Tom Rini <trini@konsulko.com> | 2016-05-23 18:32:47 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-05-23 18:32:47 -0400 |
commit | 6d54868eeb2697c9a905c4d3521efbacc44c5258 (patch) | |
tree | 6ad3ae03a0083d1a50a6152bd6dcad5630ce7823 /arch/x86/cpu/qemu/Makefile | |
parent | d7d000311285e4b8d11e089ca13ea456a01be3b8 (diff) | |
parent | 8216b11cdd50515fbc423a4b2709a00865b8621d (diff) | |
download | u-boot-imx-6d54868eeb2697c9a905c4d3521efbacc44c5258.zip u-boot-imx-6d54868eeb2697c9a905c4d3521efbacc44c5258.tar.gz u-boot-imx-6d54868eeb2697c9a905c4d3521efbacc44c5258.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/x86/cpu/qemu/Makefile')
-rw-r--r-- | arch/x86/cpu/qemu/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/cpu/qemu/Makefile b/arch/x86/cpu/qemu/Makefile index 6eeddf1..a080c5e 100644 --- a/arch/x86/cpu/qemu/Makefile +++ b/arch/x86/cpu/qemu/Makefile @@ -7,4 +7,5 @@ ifndef CONFIG_EFI_STUB obj-y += car.o dram.o endif -obj-y += cpu.o fw_cfg.o qemu.o +obj-y += qemu.o +obj-$(CONFIG_QFW) += cpu.o e820.o |