From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 2/6] tusb6010: move from hw/timer to hw/usb
Date: Tue, 23 Feb 2016 11:54:54 +0100 [thread overview]
Message-ID: <1456224898-23270-3-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1456224898-23270-1-git-send-email-kraxel@redhat.com>
From: Peter Maydell <peter.maydell@linaro.org>
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>
---
hw/timer/Makefile.objs | 1 -
hw/usb/Makefile.objs | 2 ++
hw/{timer => usb}/tusb6010.c | 0
3 files changed, 2 insertions(+), 1 deletion(-)
rename hw/{timer => usb}/tusb6010.c (100%)
diff --git a/hw/timer/Makefile.objs b/hw/timer/Makefile.objs
index 133bd0d..5cfea6e 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 8f00fbd..2717027 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
similarity index 100%
rename from hw/timer/tusb6010.c
rename to hw/usb/tusb6010.c
--
1.8.3.1
next prev parent reply other threads:[~2016-02-23 10:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-23 10:54 [Qemu-devel] [PULL 0/6] usb: misc bugfixes Gerd Hoffmann
2016-02-23 10:54 ` [Qemu-devel] [PULL 1/6] usb: check USB configuration descriptor object Gerd Hoffmann
2016-02-23 10:54 ` Gerd Hoffmann [this message]
2016-02-23 10:54 ` [Qemu-devel] [PULL 3/6] usb: check RNDIS message length Gerd Hoffmann
2016-02-23 10:54 ` [Qemu-devel] [PULL 4/6] usb: check RNDIS buffer offsets & length Gerd Hoffmann
2016-02-23 10:54 ` [Qemu-devel] [PULL 5/6] usb: add pid check at the first of uhci_handle_td() Gerd Hoffmann
2016-02-23 10:54 ` [Qemu-devel] [PULL 6/6] ohci: allocate timer only once Gerd Hoffmann
2016-02-23 11:47 ` [Qemu-devel] [PULL 0/6] usb: misc bugfixes Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456224898-23270-3-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).