diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 12:23:23 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:12 +0200 |
| commit | aaa4d1df2e18e7b3aa996836a6256eab13d4267a (patch) | |
| tree | 6c28b8a1adb360e4f92320cbd747b353d317a727 | |
| parent | 9a1179dc864ae71dec212c5da482451bcd4a4fcb (diff) | |
hw: make all of hw/usb/ configurable via default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | default-configs/arm-softmmu.mak | 1 | ||||
| -rw-r--r-- | hw/arm/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/usb/Makefile.objs | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 2d53895c31..4b72019878 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -30,6 +30,7 @@ CONFIG_DS1338=y CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI02=y CONFIG_MICRODRIVE=y +CONFIG_USB_MUSB=y CONFIG_ARM_TIMER=y CONFIG_PL011=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 6253dbcafb..d809ad858a 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -17,7 +17,7 @@ obj-y += omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \ obj-y += omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \ omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o obj-y += tsc210x.o -obj-y += blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o +obj-y += blizzard.o onenand.o cbus.o tusb6010.o obj-y += mst_fpga.o obj-y += bitbang_i2c.o marvell_88w8618_audio.o obj-y += framebuffer.o diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 5c2064422e..f9695e7d8a 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -7,6 +7,7 @@ common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o hcd-ehci-sysbus.o common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o +common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o # emulated usb devices common-obj-y += dev-hub.o |