Compile e1000, rtl8139 and usb-ohci in hwlib. Signed-off-by: Blue Swirl <blauwir...@gmail.com> --- Makefile.objs | 5 +++++ Makefile.target | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Makefile.objs b/Makefile.objs index 67f1b21..8e2aebd 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -192,6 +192,8 @@ hw-obj-y += msix.o hw-obj-y += ne2000.o hw-obj-y += eepro100.o hw-obj-y += pcnet.o +hw-obj-y += rtl8139.o +hw-obj-y += e1000.o hw-obj-$(CONFIG_SMC91C111) += smc91c111.o hw-obj-$(CONFIG_LAN9118) += lan9118.o @@ -237,6 +239,9 @@ sound-obj-$(CONFIG_CS4231A) += cs4231a.o adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0 hw-obj-$(CONFIG_SOUND) += $(sound-obj-y) +# USB layer +hw-obj-$(CONFIG_USB_OHCI) += usb-ohci.o + hw-obj-$(CONFIG_VIRTFS) += virtio-9p-debug.o virtio-9p-local.o ###################################################################### diff --git a/Makefile.target b/Makefile.target index 3ef4666..be34945 100644 --- a/Makefile.target +++ b/Makefile.target @@ -181,13 +181,6 @@ QEMU_CFLAGS += $(VNC_SASL_CFLAGS) # xen backend driver support obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o -# USB layer -obj-$(CONFIG_USB_OHCI) += usb-ohci.o - -# PCI network cards -obj-y += rtl8139.o -obj-y += e1000.o - # Hardware support obj-i386-y += vga.o obj-i386-y += mc146818rtc.o i8259.o pc.o -- 1.6.2.4