OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

build: always link device_tree.o into emulators if libfdt available

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-02-05 12:36:30 +01:00
parent 83c9f4ca79
commit 320ba5fe49
5 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.target
View File

@ -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 += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o
obj-y += qtest.o obj-y += qtest.o
obj-y += hw/ obj-y += hw/
obj-$(CONFIG_FDT) += device_tree.o
obj-$(CONFIG_KVM) += kvm-all.o obj-$(CONFIG_KVM) += kvm-all.o
obj-$(CONFIG_NO_KVM) += kvm-stub.o obj-$(CONFIG_NO_KVM) += kvm-stub.o
obj-y += memory.o savevm.o cputlb.o obj-y += memory.o savevm.o cputlb.o

7
configure vendored
View File

@ -2416,6 +2416,7 @@ int main(void) { return 0; }
EOF EOF
if compile_prog "" "$fdt_libs" ; then if compile_prog "" "$fdt_libs" ; then
fdt=yes fdt=yes
libs_softmmu="$libs_softmmu $fdt_libs"
else else
if test "$fdt" = "yes" ; then if test "$fdt" = "yes" ; then
feature_not_found "fdt" feature_not_found "fdt"
@ -3981,7 +3982,6 @@ case "$target_arch2" in
target_nptl="yes" target_nptl="yes"
gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml" gdb_xml_files="arm-core.xml arm-vfp.xml arm-vfp3.xml arm-neon.xml"
target_llong_alignment=4 target_llong_alignment=4
target_libs_softmmu="$fdt_libs"
;; ;;
cris) cris)
target_nptl="yes" target_nptl="yes"
@ -4000,7 +4000,6 @@ case "$target_arch2" in
TARGET_ARCH=microblaze TARGET_ARCH=microblaze
bflt="yes" bflt="yes"
target_nptl="yes" target_nptl="yes"
target_libs_softmmu="$fdt_libs"
;; ;;
mips|mipsel) mips|mipsel)
TARGET_ARCH=mips TARGET_ARCH=mips
@ -4025,21 +4024,18 @@ case "$target_arch2" in
ppc) ppc)
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_nptl="yes" target_nptl="yes"
target_libs_softmmu="$fdt_libs"
;; ;;
ppcemb) ppcemb)
TARGET_BASE_ARCH=ppc TARGET_BASE_ARCH=ppc
TARGET_ABI_DIR=ppc TARGET_ABI_DIR=ppc
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_nptl="yes" target_nptl="yes"
target_libs_softmmu="$fdt_libs"
;; ;;
ppc64) ppc64)
TARGET_BASE_ARCH=ppc TARGET_BASE_ARCH=ppc
TARGET_ABI_DIR=ppc TARGET_ABI_DIR=ppc
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml" gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_long_alignment=8 target_long_alignment=8
target_libs_softmmu="$fdt_libs"
;; ;;
ppc64abi32) ppc64abi32)
TARGET_ARCH=ppc64 TARGET_ARCH=ppc64
@ -4047,7 +4043,6 @@ case "$target_arch2" in
TARGET_ABI_DIR=ppc TARGET_ABI_DIR=ppc
echo "TARGET_ABI32=y" >> $config_target_mak echo "TARGET_ABI32=y" >> $config_target_mak
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml" gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml"
target_libs_softmmu="$fdt_libs"
;; ;;
sh4|sh4eb) sh4|sh4eb)
TARGET_ARCH=sh4 TARGET_ARCH=sh4

1
hw/arm/Makefile.objs
View File

@ -31,6 +31,5 @@ obj-y += strongarm.o
obj-y += collie.o obj-y += collie.o
obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o
obj-y += kzm.o obj-y += kzm.o
obj-$(CONFIG_FDT) += ../device_tree.o
obj-y := $(addprefix ../,$(obj-y)) obj-y := $(addprefix ../,$(obj-y))

1
hw/microblaze/Makefile.objs
View File

@ -5,6 +5,5 @@ obj-y += xilinx_spi.o
obj-y += microblaze_pic_cpu.o obj-y += microblaze_pic_cpu.o
obj-y += xilinx_ethlite.o obj-y += xilinx_ethlite.o
obj-$(CONFIG_FDT) += ../device_tree.o
obj-y := $(addprefix ../,$(obj-y)) obj-y := $(addprefix ../,$(obj-y))

1
hw/ppc/Makefile.objs
View File

@ -16,7 +16,6 @@ obj-$(CONFIG_FDT) += mpc8544_guts.o ppce500_spin.o
obj-y += virtex_ml507.o obj-y += virtex_ml507.o
# PowerPC OpenPIC # PowerPC OpenPIC
obj-y += openpic.o obj-y += openpic.o
obj-$(CONFIG_FDT) += ../device_tree.o
# Xilinx PPC peripherals # Xilinx PPC peripherals
obj-y += xilinx_ethlite.o obj-y += xilinx_ethlite.o