mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify fdt libs selection

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-07-27 16:13:20 +02:00 committed by Anthony Liguori
parent 4baae0acb8
commit b41af4ba44
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.target
View File

@ -514,9 +514,7 @@ CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
endif endif
obj-ppc-$(CONFIG_FDT) += device_tree.o obj-ppc-$(CONFIG_FDT) += device_tree.o
ifdef FDT_LIBS
LIBS+= $(FDT_LIBS) LIBS+= $(FDT_LIBS)
endif
obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
obj-mips-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o obj-mips-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o
@ -542,9 +540,7 @@ obj-microblaze-y += xilinx_ethlite.o
obj-microblaze-y += pflash_cfi02.o obj-microblaze-y += pflash_cfi02.o
obj-microblaze-$(CONFIG_FDT) += device_tree.o obj-microblaze-$(CONFIG_FDT) += device_tree.o
ifdef FDT_LIBS
LIBS+= $(FDT_LIBS) LIBS+= $(FDT_LIBS)
endif
# Boards # Boards
obj-cris-y = cris_pic_cpu.o etraxfs.o axis_dev88.o obj-cris-y = cris_pic_cpu.o etraxfs.o axis_dev88.o

5
configure vendored
View File

@ -1258,10 +1258,11 @@ fi
# fdt probe # fdt probe
if test "$fdt" = "yes" ; then if test "$fdt" = "yes" ; then
fdt=no fdt=no
fdt_libs="-lfdt"
cat > $TMPC << EOF cat > $TMPC << EOF
int main(void) { return 0; } int main(void) { return 0; }
EOF EOF
if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $TMPC -lfdt 2> /dev/null > /dev/null ; then if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $TMPC $fdt_libs 2> /dev/null > /dev/null ; then
fdt=yes fdt=yes
fi fi
fi fi
@ -1711,7 +1712,7 @@ fi
if test "$fdt" = "yes" ; then if test "$fdt" = "yes" ; then
echo "CONFIG_FDT=y" >> $config_host_mak echo "CONFIG_FDT=y" >> $config_host_mak
echo "#define CONFIG_FDT 1" >> $config_host_h echo "#define CONFIG_FDT 1" >> $config_host_h
echo "FDT_LIBS=-lfdt" >> $config_host_mak echo "FDT_LIBS=$fdt_libs" >> $config_host_mak
fi fi
# XXX: suppress that # XXX: suppress that