From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHe7R-0007yI-GW for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:45:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UHdyo-00025B-MQ for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:36:23 -0400 Received: from mail-bk0-x235.google.com ([2a00:1450:4008:c01::235]:53084) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UHdyo-00024o-By for qemu-devel@nongnu.org; Mon, 18 Mar 2013 13:36:14 -0400 Received: by mail-bk0-f53.google.com with SMTP id j10so2699151bkw.12 for ; Mon, 18 Mar 2013 10:36:13 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Mon, 18 Mar 2013 18:35:14 +0100 Message-Id: <1363628125-5310-25-git-send-email-pbonzini@redhat.com> In-Reply-To: <1363628125-5310-1-git-send-email-pbonzini@redhat.com> References: <1363628125-5310-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 24/35] hw: move input devices to hw/input/, configure with default-configs/ List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 + hw/arm/Makefile.objs | 3 +-- hw/input/Makefile.objs | 4 ++++ hw/{ => input}/milkymist-softusb.c | 0 hw/{ => input}/pxa2xx_keypad.c | 0 hw/{ => input}/tsc210x.c | 0 hw/lm32/Makefile.objs | 1 - 7 files changed, 6 insertions(+), 3 deletions(-) rename hw/{ => input}/milkymist-softusb.c (100%) rename hw/{ => input}/pxa2xx_keypad.c (100%) rename hw/{ => input}/tsc210x.c (100%) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 45c3d54..94b52da 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -57,6 +57,7 @@ CONFIG_XILINX_SPIPS=y CONFIG_MARVELL_88W8618=y CONFIG_OMAP=y +CONFIG_TSC210X=y CONFIG_BLIZZARD=y CONFIG_ONENAND=y CONFIG_TUSB6010=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 5ddb90f..7691540 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -7,13 +7,12 @@ obj-y += exynos4210_pmu.o obj-y += a15mpcore.o obj-y += armv7m_nvic.o obj-y += pxa2xx_dma.o -obj-y += pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o +obj-y += pxa2xx_mmci.o pxa2xx_pcmcia.o obj-y += zaurus.o obj-y += omap_dma.o omap_clk.o omap_mmc.o \ omap_gpio.o omap_intc.o obj-y += soc_dma.o \ omap_gpmc.o omap_sdrc.o omap_tap.o omap_l4.o -obj-y += tsc210x.o obj-y += cbus.o obj-y += mst_fpga.o obj-y += strongarm.o diff --git a/hw/input/Makefile.objs b/hw/input/Makefile.objs index 824997e..e8c80b9 100644 --- a/hw/input/Makefile.objs +++ b/hw/input/Makefile.objs @@ -7,3 +7,7 @@ common-obj-y += ps2.o common-obj-$(CONFIG_STELLARIS_INPUT) += stellaris_input.o common-obj-$(CONFIG_TSC2005) += tsc2005.o common-obj-$(CONFIG_VMMOUSE) += vmmouse.o + +obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o +obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o +obj-$(CONFIG_TSC210X) += tsc210x.o diff --git a/hw/milkymist-softusb.c b/hw/input/milkymist-softusb.c similarity index 100% rename from hw/milkymist-softusb.c rename to hw/input/milkymist-softusb.c diff --git a/hw/pxa2xx_keypad.c b/hw/input/pxa2xx_keypad.c similarity index 100% rename from hw/pxa2xx_keypad.c rename to hw/input/pxa2xx_keypad.c diff --git a/hw/tsc210x.c b/hw/input/tsc210x.c similarity index 100% rename from hw/tsc210x.c rename to hw/input/tsc210x.c diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs index b48cdb1..fe8427f 100644 --- a/hw/lm32/Makefile.objs +++ b/hw/lm32/Makefile.objs @@ -4,7 +4,6 @@ obj-y += lm32_sys.o obj-y += milkymist-hpdmc.o obj-y += milkymist-memcard.o obj-y += milkymist-pfpu.o -obj-y += milkymist-softusb.o obj-y += milkymist-sysctl.o obj-y := $(addprefix ../,$(obj-y)) -- 1.8.1.4