Re: [Qemu-devel] [PATCH v2] device-tree: Make a common-obj

[Alexander Graf]

On 24.05.15 22:20, Peter Crosthwaite wrote:
> 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 <address@hidden>
> Reviewed-by: Andreas Färber <address@hidden>
> Signed-off-by: Peter Crosthwaite <address@hidden>

Doesn't this mean that we're now linking against libfdt on
qemu-system-x86_64?


Alex

> ---
>  Makefile.objs   | 2 ++
>  Makefile.target | 1 -
>  device_tree.c   | 1 -
>  3 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile.objs b/Makefile.objs
> index 28999d3..4881d2c 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 1083377..5100013 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 3d119ef..d2de580 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"
>