diff options
| author | Peter Crosthwaite <crosthwaitepeter@gmail.com> | 2015-05-24 13:20:14 -0700 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2015-06-03 14:21:24 +0300 |
| commit | 7df057bac3734ee3c2c052fd0807479602ab5583 (patch) | |
| tree | 082749bb5b2da7174dd25d865ca37f30036347ec | |
| parent | d370dfa9f3703cf0af07d96d50ed567413e8ec65 (diff) | |
| download | qemu-7df057bac3734ee3c2c052fd0807479602ab5583.tar.gz | |
device-tree: Make a common-obj
There is no reason for device tree API to be built per-target.
common-obj it. There is an extraneous inclusion of config.h that
needs to be removed.
Cc: Alexander Graf <agraf@suse.de>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | Makefile.objs | 2 | ||||
| -rw-r--r-- | Makefile.target | 1 | ||||
| -rw-r--r-- | device_tree.c | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.objs b/Makefile.objs index 28999d39c4..4881d2c2a6 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -76,6 +76,8 @@ common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y) +common-obj-$(CONFIG_FDT) += device_tree.o + ###################################################################### # qapi diff --git a/Makefile.target b/Makefile.target index be01dd39c1..3e861c8413 100644 --- a/Makefile.target +++ b/Makefile.target @@ -129,7 +129,6 @@ ifdef CONFIG_SOFTMMU obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o obj-y += qtest.o bootdevice.o obj-y += hw/ -obj-$(CONFIG_FDT) += device_tree.o obj-$(CONFIG_KVM) += kvm-all.o obj-y += memory.o savevm.o cputlb.o obj-y += memory_mapping.o diff --git a/device_tree.c b/device_tree.c index 3d119ef0bd..d2de580947 100644 --- a/device_tree.c +++ b/device_tree.c @@ -18,7 +18,6 @@ #include <unistd.h> #include <stdlib.h> -#include "config.h" #include "qemu-common.h" #include "qemu/error-report.h" #include "sysemu/device_tree.h" |