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 <[email protected]> Reviewed-by: Andreas Färber <[email protected]> Signed-off-by: Peter Crosthwaite <[email protected]> Signed-off-by: Michael Tokarev <[email protected]>
xlee · Jun 3, 2015 · 7df057b · 7df057b
1 parent d370dfa
commit 7df057b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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"
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@