diff options
| -rw-r--r-- | Makefile.objs | 1 | ||||
| -rw-r--r-- | Makefile.target | 4 | ||||
| -rw-r--r-- | default-configs/i386-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/mips-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/mips64-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/mips64el-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/mipsel-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/x86_64-softmmu.mak | 1 |
8 files changed, 9 insertions, 2 deletions
diff --git a/Makefile.objs b/Makefile.objs index 0f0795c695..fb7b780636 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -140,6 +140,7 @@ hw-obj-$(CONFIG_ESCC) += escc.o hw-obj-$(CONFIG_PARALLEL) += parallel.o hw-obj-$(CONFIG_I8254) += i8254.o hw-obj-$(CONFIG_PCSPK) += pcspk.o +hw-obj-$(CONFIG_USB_UHCI) += usb-uhci.o # PCI watchdog devices hw-obj-y += wdt_i6300esb.o diff --git a/Makefile.target b/Makefile.target index 54b6f0f208..f545630e1b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -202,7 +202,7 @@ obj-i386-y += pckbd.o $(sound-obj-y) dma.o obj-i386-y += vga.o obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o pc.o obj-i386-y += cirrus_vga.o apic.o ioapic.o acpi.o piix_pci.o -obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o +obj-i386-y += vmmouse.o vmport.o vmware_vga.o hpet.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o obj-i386-y += ne2000-isa.o debugcon.o multiboot.o @@ -233,7 +233,7 @@ obj-mips-y += dma.o vga.o serial.o i8259.o rc4030.o obj-mips-y += vga-isa-mm.o obj-mips-y += g364fb.o jazz_led.o dp8393x.o obj-mips-y += ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o -obj-mips-y += gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o +obj-mips-y += gt64xxx.o pckbd.o fdc.o mc146818rtc.o acpi.o ds1225y.o obj-mips-y += piix4.o cirrus_vga.o $(sound-obj-y) obj-mips-y += mipsnet.o ne2000-isa.o obj-mips-y += pflash_cfi01.o diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak index 522aa1f57f..0f532bb8b7 100644 --- a/default-configs/i386-softmmu.mak +++ b/default-configs/i386-softmmu.mak @@ -6,3 +6,4 @@ CONFIG_VGA_ISA=y CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y +CONFIG_USB_UHCI=y diff --git a/default-configs/mips-softmmu.mak b/default-configs/mips-softmmu.mak index 9eeeea8bfd..c0fe54ee5f 100644 --- a/default-configs/mips-softmmu.mak +++ b/default-configs/mips-softmmu.mak @@ -7,3 +7,4 @@ CONFIG_VGA_ISA=y CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y +CONFIG_USB_UHCI=y diff --git a/default-configs/mips64-softmmu.mak b/default-configs/mips64-softmmu.mak index 4e204a40d6..1543c4fc55 100644 --- a/default-configs/mips64-softmmu.mak +++ b/default-configs/mips64-softmmu.mak @@ -7,3 +7,4 @@ CONFIG_VGA_ISA=y CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y +CONFIG_USB_UHCI=y diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index cd98c88b5a..acf06048d3 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -7,3 +7,4 @@ CONFIG_VGA_ISA=y CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y +CONFIG_USB_UHCI=y diff --git a/default-configs/mipsel-softmmu.mak b/default-configs/mipsel-softmmu.mak index 50a33f1b4d..f1878fcfa1 100644 --- a/default-configs/mipsel-softmmu.mak +++ b/default-configs/mipsel-softmmu.mak @@ -7,3 +7,4 @@ CONFIG_VGA_ISA=y CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y +CONFIG_USB_UHCI=y diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak index 00e2afc7df..115051203f 100644 --- a/default-configs/x86_64-softmmu.mak +++ b/default-configs/x86_64-softmmu.mak @@ -6,3 +6,4 @@ CONFIG_VGA_ISA=y CONFIG_PARALLEL=y CONFIG_I8254=y CONFIG_PCSPK=y +CONFIG_USB_UHCI=y |