gwj / at91sam9263 · Commits

Commit 1fd31ad763008df26af22fe36ca1d4e1030734d4

Authored by aliguori
1 parent 16b29ae1

Fix the build for non-x86/ppc targets 

Since pci.c creates network devices, anything that links against pci.c
(everything) has to link against all network devices.  Since virtio-net 
also requires virtio, we might as well link every target against all of 
the virtio devices.

This suggests that the pci.c network device creation function needs some 
refactoring.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6082 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 3 additions and 4 deletions
Makefile.target
  View file @1fd31ad
@@ -557,6 +557,9 @@ endif #CONFIG_BSD_USER @@ -557,6 +557,9 @@ endif #CONFIG_BSD_USER
557 ifndef CONFIG_USER_ONLY 557 ifndef CONFIG_USER_ONLY
558 558
559 OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o 559 OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o
  560 +# virtio has to be here due to weird dependency between PCI and virtio-net.
  561 +# need to fix this properly
  562 +OBJS+=virtio.o virtio-blk.o virtio-balloon.o virtio-net.o
560 OBJS+=fw_cfg.o 563 OBJS+=fw_cfg.o
561 ifdef CONFIG_KVM 564 ifdef CONFIG_KVM
562 OBJS+=kvm.o kvm-all.o 565 OBJS+=kvm.o kvm-all.o
@@ -636,8 +639,6 @@ OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o @@ -636,8 +639,6 @@ OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o
636 OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o 639 OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o
637 OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o 640 OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o
638 OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o 641 OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o
639 -# virtio support  
640 -OBJS+= virtio.o virtio-blk.o virtio-balloon.o virtio-net.o  
641 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE 642 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
642 endif 643 endif
643 ifeq ($(TARGET_BASE_ARCH), ppc) 644 ifeq ($(TARGET_BASE_ARCH), ppc)
@@ -663,8 +664,6 @@ endif @@ -663,8 +664,6 @@ endif
663 ifdef CONFIG_KVM 664 ifdef CONFIG_KVM
664 OBJS+= kvm_ppc.o 665 OBJS+= kvm_ppc.o
665 endif 666 endif
666 -# virtio support  
667 -OBJS+= virtio.o virtio-blk.o virtio-balloon.o virtio-net.o  
668 endif 667 endif
669 ifeq ($(TARGET_BASE_ARCH), mips) 668 ifeq ($(TARGET_BASE_ARCH), mips)
670 OBJS+= mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o 669 OBJS+= mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o