Commit 320ba5fe authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 83c9f4ca

Makefile.target

+1 −0
Original line number Diff line number Diff line
@@ -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

configure

+1 −6
Original line number Diff line number Diff line
@@ -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

hw/arm/Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -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))

hw/microblaze/Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -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))

hw/ppc/Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -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