[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/18] build: always link device_tree.o into emulato
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 10/18] build: always link device_tree.o into emulators if libfdt available |
Date: |
Tue, 5 Mar 2013 18:17:37 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile.target | 1 +
configure | 7 +------
hw/arm/Makefile.objs | 1 -
hw/microblaze/Makefile.objs | 1 -
hw/ppc/Makefile.objs | 1 -
5 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index ca657b3..2bd6d14 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -111,6 +111,7 @@ CONFIG_NO_CORE_DUMP = $(if $(subst
n,,$(CONFIG_HAVE_CORE_DUMP)),n,y)
obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o
obj-y += qtest.o
obj-y += hw/
+obj-$(CONFIG_FDT) += device_tree.o
obj-$(CONFIG_KVM) += kvm-all.o
obj-$(CONFIG_NO_KVM) += kvm-stub.o
obj-y += memory.o savevm.o cputlb.o
diff --git a/configure b/configure
index 19738ac..8fdc2cf 100755
--- a/configure
+++ b/configure
@@ -2416,6 +2416,7 @@ int main(void) { return 0; }
EOF
if compile_prog "" "$fdt_libs" ; then
fdt=yes
+ libs_softmmu="$libs_softmmu $fdt_libs"
else
if test "$fdt" = "yes" ; then
feature_not_found "fdt"
@@ -3981,7 +3982,6 @@ case "$target_arch2" in
target_nptl="yes"
gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml"
target_llong_alignment=4
- target_libs_softmmu="$fdt_libs"
;;
cris)
target_nptl="yes"
@@ -4000,7 +4000,6 @@ case "$target_arch2" in
TARGET_ARCH=microblaze
bflt="yes"
target_nptl="yes"
- target_libs_softmmu="$fdt_libs"
;;
mips|mipsel)
TARGET_ARCH=mips
@@ -4025,21 +4024,18 @@ case "$target_arch2" in
ppc)
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml
power-spe.xml"
target_nptl="yes"
- target_libs_softmmu="$fdt_libs"
;;
ppcemb)
TARGET_BASE_ARCH=ppc
TARGET_ABI_DIR=ppc
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml
power-spe.xml"
target_nptl="yes"
- target_libs_softmmu="$fdt_libs"
;;
ppc64)
TARGET_BASE_ARCH=ppc
TARGET_ABI_DIR=ppc
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml
power-spe.xml"
target_long_alignment=8
- target_libs_softmmu="$fdt_libs"
;;
ppc64abi32)
TARGET_ARCH=ppc64
@@ -4047,7 +4043,6 @@ case "$target_arch2" in
TARGET_ABI_DIR=ppc
echo "TARGET_ABI32=y" >> $config_target_mak
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml
power-spe.xml"
- target_libs_softmmu="$fdt_libs"
;;
sh4|sh4eb)
TARGET_ARCH=sh4
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 4c10985..3eb1366 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -31,6 +31,5 @@ obj-y += strongarm.o
obj-y += collie.o
obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o
obj-y += kzm.o
-obj-$(CONFIG_FDT) += ../device_tree.o
obj-y := $(addprefix ../,$(obj-y))
diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs
index 3028e65..2ff8048 100644
--- a/hw/microblaze/Makefile.objs
+++ b/hw/microblaze/Makefile.objs
@@ -5,6 +5,5 @@ obj-y += xilinx_spi.o
obj-y += microblaze_pic_cpu.o
obj-y += xilinx_ethlite.o
-obj-$(CONFIG_FDT) += ../device_tree.o
obj-y := $(addprefix ../,$(obj-y))
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index f762050..bbbe78e 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -16,7 +16,6 @@ obj-$(CONFIG_FDT) += mpc8544_guts.o ppce500_spin.o
obj-y += virtex_ml507.o
# PowerPC OpenPIC
obj-y += openpic.o
-obj-$(CONFIG_FDT) += ../device_tree.o
# Xilinx PPC peripherals
obj-y += xilinx_ethlite.o
--
1.8.1.2
- [Qemu-devel] [PULL 00/18] hw/ reorganization, part 1, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 02/18] hw: move fifo.[ch] to libqemuutil, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 05/18] virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 03/18] hw: move qdev-monitor.o to toplevel directory, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 04/18] hw: move device-hotplug.o to toplevel, compile it once, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 07/18] vt82c686: vt82c686 is not a PCI host bridge, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 01/18] hw: move char backends to backends/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 08/18] ppc: do not use ../ in include files, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 06/18] virtio-9p: remove PCI dependencies from hw/9pfs/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 11/18] ppc: express FDT dependency of pSeries and e500 boards via default-configs/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 10/18] build: always link device_tree.o into emulators if libfdt available,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 13/18] arm: move files referencing CPU to hw/arm/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 14/18] i386: move files referencing CPU to hw/i386/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 17/18] ppc: move more files to hw/ppc, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 15/18] m68k: move files referencing CPU to hw/m68k/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 12/18] hw: move boards and other isolated files to hw/ARCH, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 18/18] sh: move files referencing CPU to hw/sh4/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 16/18] ppc: move files referencing CPU to hw/ppc/, Paolo Bonzini, 2013/03/05
- [Qemu-devel] [PATCH 09/18] hw: include hw header files with full paths, Paolo Bonzini, 2013/03/05
- Re: [Qemu-devel] [PULL 00/18] hw/ reorganization, part 1, Paolo Bonzini, 2013/03/09