diff options
| author | Peter Maydell | 2016-02-19 13:03:24 +0100 |
|---|---|---|
| committer | Gerd Hoffmann | 2016-02-23 10:38:00 +0100 |
| commit | 14ec7b2c5bc0e7b0f7097211d349b57450f09d02 (patch) | |
| tree | 5629f5cfcae5e0bda99f824c58d81edf3f4f1387 /hw | |
| parent | usb: check USB configuration descriptor object (diff) | |
| download | qemu-14ec7b2c5bc0e7b0f7097211d349b57450f09d02.tar.gz qemu-14ec7b2c5bc0e7b0f7097211d349b57450f09d02.tar.xz qemu-14ec7b2c5bc0e7b0f7097211d349b57450f09d02.zip | |
tusb6010: move from hw/timer to hw/usb
The TUSB6010 is a USB controller (as the name suggests). Move it from
hw/timer (where it was accidentally filed in 2013 when we moved
everything out of hw/) to hw/usb.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1455883404-10976-1-git-send-email-peter.maydell@linaro.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/timer/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/usb/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/usb/tusb6010.c (renamed from hw/timer/tusb6010.c) | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs index 133bd0d455..5cfea6e0da 100644 --- a/hw/timer/Makefile.objs +++ b/hw/timer/Makefile.objs @@ -25,7 +25,6 @@ obj-$(CONFIG_OMAP) += omap_gptimer.o obj-$(CONFIG_OMAP) += omap_synctimer.o obj-$(CONFIG_PXA2XX) += pxa2xx_timer.o obj-$(CONFIG_SH4) += sh_timer.o -obj-$(CONFIG_TUSB6010) += tusb6010.o obj-$(CONFIG_DIGIC) += digic-timer.o obj-$(CONFIG_MC146818RTC) += mc146818rtc.o diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 8f00fbd8f6..2717027d34 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -10,6 +10,8 @@ common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci-sysbus.o common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o +obj-$(CONFIG_TUSB6010) += tusb6010.o + # emulated usb devices common-obj-$(CONFIG_USB) += dev-hub.o common-obj-$(CONFIG_USB) += dev-hid.o diff --git a/hw/timer/tusb6010.c b/hw/usb/tusb6010.c index 9f6af90806..9f6af90806 100644 --- a/hw/timer/tusb6010.c +++ b/hw/usb/tusb6010.c |