From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 19/35] hw: move char devices to hw/char/, configure via default-configs/
Date: Tue, 2 Apr 2013 16:58:53 +0200 [thread overview]
Message-ID: <1364914749-11141-20-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1364914749-11141-1-git-send-email-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
default-configs/arm-softmmu.mak | 1 +
default-configs/i386-softmmu.mak | 1 +
default-configs/lm32-softmmu.mak | 1 +
default-configs/s390x-softmmu.mak | 1 +
default-configs/sparc-softmmu.mak | 1 +
default-configs/x86_64-softmmu.mak | 1 +
hw/arm/Makefile.objs | 6 +++---
hw/char/Makefile.objs | 15 +++++++++++++++
hw/{ => char}/debugcon.c | 0
hw/{ => char}/etraxfs_ser.c | 0
hw/{ => char}/exynos4210_uart.c | 0
hw/{ => char}/grlib_apbuart.c | 0
hw/{ => char}/imx_serial.c | 0
hw/{ => char}/lm32_juart.c | 0
hw/{ => char}/lm32_uart.c | 0
hw/{ => char}/mcf_uart.c | 0
hw/{ => char}/milkymist-uart.c | 0
hw/{ => char}/omap_uart.c | 0
hw/{s390x => char}/sclpconsole.c | 0
hw/{ => char}/sh_serial.c | 0
hw/{ => char}/spapr_vty.c | 0
hw/cris/Makefile.objs | 1 -
hw/i386/Makefile.objs | 2 +-
hw/lm32/Makefile.objs | 3 ---
hw/m68k/Makefile.objs | 4 ----
hw/ppc/Makefile.objs | 1 -
hw/s390x/Makefile.objs | 2 +-
hw/sh4/Makefile.objs | 2 +-
hw/sparc/Makefile.objs | 2 +-
29 files changed, 28 insertions(+), 16 deletions(-)
rename hw/{ => char}/debugcon.c (100%)
rename hw/{ => char}/etraxfs_ser.c (100%)
rename hw/{ => char}/exynos4210_uart.c (100%)
rename hw/{ => char}/grlib_apbuart.c (100%)
rename hw/{ => char}/imx_serial.c (100%)
rename hw/{ => char}/lm32_juart.c (100%)
rename hw/{ => char}/lm32_uart.c (100%)
rename hw/{ => char}/mcf_uart.c (100%)
rename hw/{ => char}/milkymist-uart.c (100%)
rename hw/{ => char}/omap_uart.c (100%)
rename hw/{s390x => char}/sclpconsole.c (100%)
rename hw/{ => char}/sh_serial.c (100%)
rename hw/{ => char}/spapr_vty.c (100%)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 8eb04e2..8da5ec8 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -57,6 +57,7 @@ CONFIG_MARVELL_88W8618=y
CONFIG_OMAP=y
CONFIG_BLIZZARD=y
CONFIG_ONENAND=y
+CONFIG_IMX=y
CONFIG_ZAURUS=y
CONFIG_VERSATILE_PCI=y
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 6723051..60010b1 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -34,3 +34,4 @@ CONFIG_MC146818RTC=y
CONFIG_WDT_IB700=y
CONFIG_PC_SYSFW=y
CONFIG_XEN_I386=$(CONFIG_XEN)
+CONFIG_ISA_DEBUG=y
diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak
index 6b2ee43..ef0f4ba 100644
--- a/default-configs/lm32-softmmu.mak
+++ b/default-configs/lm32-softmmu.mak
@@ -1,5 +1,6 @@
# Default configuration for lm32-softmmu
+CONFIG_LM32=y
CONFIG_MILKYMIST=y
CONFIG_FRAMEBUFFER=y
CONFIG_PTIMER=y
diff --git a/default-configs/s390x-softmmu.mak b/default-configs/s390x-softmmu.mak
index 3005729..81fbc68 100644
--- a/default-configs/s390x-softmmu.mak
+++ b/default-configs/s390x-softmmu.mak
@@ -1 +1,2 @@
CONFIG_VIRTIO=y
+CONFIG_SCLPCONSOLE=y
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 25bcbe3..da5b02d 100644
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -11,3 +11,4 @@ CONFIG_PCNET_COMMON=y
CONFIG_LANCE=y
CONFIG_TCX=y
CONFIG_CS4231=y
+CONFIG_GRLIB=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index f0e5595..c2a3d4e 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -34,3 +34,4 @@ CONFIG_MC146818RTC=y
CONFIG_WDT_IB700=y
CONFIG_PC_SYSFW=y
CONFIG_XEN_I386=$(CONFIG_XEN)
+CONFIG_ISA_DEBUG=y
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 6f764e6..26e107f 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -3,7 +3,7 @@ obj-y += arm_gic.o arm_gic_common.o
obj-y += a9scu.o
obj-y += realview_gic.o arm_sysctl.o arm11mpcore.o a9mpcore.o
obj-y += exynos4210_gic.o exynos4210_combiner.o
-obj-y += exynos4210_uart.o exynos4210_pwm.o
+obj-y += exynos4210_pwm.o
obj-y += exynos4210_pmu.o exynos4210_mct.o
obj-y += exynos4210_rtc.o
obj-y += arm_mptimer.o a15mpcore.o
@@ -12,14 +12,14 @@ obj-y += pxa2xx_timer.o pxa2xx_dma.o
obj-y += pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
obj-y += zaurus.o
obj-y += omap_dma.o omap_clk.o omap_mmc.o \
- omap_gpio.o omap_intc.o omap_uart.o
+ omap_gpio.o omap_intc.o
obj-y += soc_dma.o omap_gptimer.o omap_synctimer.o \
omap_gpmc.o omap_sdrc.o omap_tap.o omap_l4.o
obj-y += tsc210x.o
obj-y += cbus.o tusb6010.o
obj-y += mst_fpga.o
obj-y += strongarm.o
-obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o
+obj-y += imx_ccm.o imx_timer.o imx_avic.o
obj-$(CONFIG_KVM) += kvm/arm_gic.o
obj-y := $(addprefix ../,$(obj-y))
diff --git a/hw/char/Makefile.objs b/hw/char/Makefile.objs
index ddfd3ec..6f51da0 100644
--- a/hw/char/Makefile.objs
+++ b/hw/char/Makefile.objs
@@ -9,4 +9,19 @@ common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
common-obj-$(CONFIG_XEN_BACKEND) += xen_console.o
common-obj-$(CONFIG_CADENCE) += cadence_uart.o
+obj-$(CONFIG_SCLPCONSOLE) += sclpconsole.o
+obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o
+obj-$(CONFIG_EXYNOS4) += exynos4210_uart.o
+obj-$(CONFIG_COLDFIRE) += mcf_uart.o
+obj-$(CONFIG_OMAP) += omap_uart.o
+obj-$(CONFIG_SH4) += sh_serial.o
+obj-$(CONFIG_PSERIES) += spapr_vty.o
+
+common-obj-$(CONFIG_ISA_DEBUG) += debugcon.o
+common-obj-$(CONFIG_GRLIB) += grlib_apbuart.o
+common-obj-$(CONFIG_IMX) += imx_serial.o
+common-obj-$(CONFIG_LM32) += lm32_juart.o
+common-obj-$(CONFIG_LM32) += lm32_uart.o
+common-obj-$(CONFIG_MILKYMIST) += milkymist-uart.o
+
obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o
diff --git a/hw/debugcon.c b/hw/char/debugcon.c
similarity index 100%
rename from hw/debugcon.c
rename to hw/char/debugcon.c
diff --git a/hw/etraxfs_ser.c b/hw/char/etraxfs_ser.c
similarity index 100%
rename from hw/etraxfs_ser.c
rename to hw/char/etraxfs_ser.c
diff --git a/hw/exynos4210_uart.c b/hw/char/exynos4210_uart.c
similarity index 100%
rename from hw/exynos4210_uart.c
rename to hw/char/exynos4210_uart.c
diff --git a/hw/grlib_apbuart.c b/hw/char/grlib_apbuart.c
similarity index 100%
rename from hw/grlib_apbuart.c
rename to hw/char/grlib_apbuart.c
diff --git a/hw/imx_serial.c b/hw/char/imx_serial.c
similarity index 100%
rename from hw/imx_serial.c
rename to hw/char/imx_serial.c
diff --git a/hw/lm32_juart.c b/hw/char/lm32_juart.c
similarity index 100%
rename from hw/lm32_juart.c
rename to hw/char/lm32_juart.c
diff --git a/hw/lm32_uart.c b/hw/char/lm32_uart.c
similarity index 100%
rename from hw/lm32_uart.c
rename to hw/char/lm32_uart.c
diff --git a/hw/mcf_uart.c b/hw/char/mcf_uart.c
similarity index 100%
rename from hw/mcf_uart.c
rename to hw/char/mcf_uart.c
diff --git a/hw/milkymist-uart.c b/hw/char/milkymist-uart.c
similarity index 100%
rename from hw/milkymist-uart.c
rename to hw/char/milkymist-uart.c
diff --git a/hw/omap_uart.c b/hw/char/omap_uart.c
similarity index 100%
rename from hw/omap_uart.c
rename to hw/char/omap_uart.c
diff --git a/hw/s390x/sclpconsole.c b/hw/char/sclpconsole.c
similarity index 100%
rename from hw/s390x/sclpconsole.c
rename to hw/char/sclpconsole.c
diff --git a/hw/sh_serial.c b/hw/char/sh_serial.c
similarity index 100%
rename from hw/sh_serial.c
rename to hw/char/sh_serial.c
diff --git a/hw/spapr_vty.c b/hw/char/spapr_vty.c
similarity index 100%
rename from hw/spapr_vty.c
rename to hw/char/spapr_vty.c
diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs
index e02365d..c4d5189 100644
--- a/hw/cris/Makefile.objs
+++ b/hw/cris/Makefile.objs
@@ -2,7 +2,6 @@
obj-y += etraxfs_dma.o
obj-y += etraxfs_pic.o
obj-y += etraxfs_timer.o
-obj-y += etraxfs_ser.o
obj-y := $(addprefix ../,$(obj-y))
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index c85bb3d..5e91d1e 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -1,7 +1,7 @@
obj-y += apic_common.o apic.o
obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o
obj-y += vmport.o
-obj-y += debugcon.o debugexit.o
+obj-y += debugexit.o
obj-y += lpc_ich9.o q35.o
obj-y += kvm/
obj-y += pc-testdev.o
diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs
index a894c46..e116156 100644
--- a/hw/lm32/Makefile.objs
+++ b/hw/lm32/Makefile.objs
@@ -1,15 +1,12 @@
# LM32 peripherals
obj-y += lm32_pic.o
-obj-y += lm32_juart.o
obj-y += lm32_timer.o
-obj-y += lm32_uart.o
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 += milkymist-uart.o
obj-y := $(addprefix ../,$(obj-y))
diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs
index ebbe003..c4352e7 100644
--- a/hw/m68k/Makefile.objs
+++ b/hw/m68k/Makefile.objs
@@ -1,7 +1,3 @@
-obj-y = mcf_uart.o
-
-obj-y := $(addprefix ../,$(obj-y))
-
obj-y += an5206.o mcf5208.o
obj-y += dummy_m68k.o
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 2d51ae9..1e24b58 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -1,5 +1,4 @@
# IBM pSeries (sPAPR)
-obj-$(CONFIG_PSERIES) += spapr_vty.o
obj-$(CONFIG_PSERIES) += spapr_pci.o
obj-$(CONFIG_PSERIES) += spapr_nvram.o
# PowerPC 4xx boards
diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
index 9f2f419..77e1218 100644
--- a/hw/s390x/Makefile.objs
+++ b/hw/s390x/Makefile.objs
@@ -2,7 +2,7 @@ obj-y = s390-virtio-bus.o s390-virtio.o
obj-y += s390-virtio-hcall.o
obj-y += sclp.o
obj-y += event-facility.o
-obj-y += sclpquiesce.o sclpconsole.o
+obj-y += sclpquiesce.o
obj-y += ipl.o
obj-y += css.o
obj-y += s390-virtio-ccw.o
diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs
index c9b0416..10c971a 100644
--- a/hw/sh4/Makefile.objs
+++ b/hw/sh4/Makefile.objs
@@ -1,4 +1,4 @@
-obj-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o
+obj-y += sh_timer.o sh_intc.o sh_pci.o
obj-y := $(addprefix ../,$(obj-y))
diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs
index 2354616..e18bc67 100644
--- a/hw/sparc/Makefile.objs
+++ b/hw/sparc/Makefile.objs
@@ -3,7 +3,7 @@ obj-y += slavio_timer.o slavio_misc.o sparc32_dma.o
obj-y += eccmemctl.o sbi.o sun4c_intctl.o
# GRLIB
-obj-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o
+obj-y += grlib_gptimer.o grlib_irqmp.o
obj-y := $(addprefix ../,$(obj-y))
--
1.8.1.4
next prev parent reply other threads:[~2013-04-02 15:14 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-02 14:58 [Qemu-devel] [PATCH v2 00/36] hw/ reorganization, part 2 Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 01/35] hw: move headers to include/ Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 02/35] hw: make subdirectories for devices Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 03/35] moxie: configure with default-configs file Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 04/35] hw: move target-independent files to subdirectories Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 05/35] hw: move virtio devices to hw/ subdirectories Paolo Bonzini
2013-04-03 10:47 ` Michael S. Tsirkin
2013-04-03 11:49 ` Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 06/35] hw: make all of hw/ide/ configurable via default-configs/ Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 07/35] hw: make all of hw/usb/ " Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 08/35] hw: make all of hw/pci/ " Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 09/35] hw: move watchdogs to hw/watchdog, configure " Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 10/35] hw: move MC146818RTC to hw/timer/, " Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 11/35] hw: move NICs to hw/net/, " Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 12/35] hw: move block devices to hw/block/, " Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 13/35] hw: move audio devices to hw/audio/, " Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 14/35] hw: move display devices to hw/display/, " Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 15/35] hw: move I2C controllers to hw/i2c/, " Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 16/35] hw: move SSI controllers to hw/ssi/, " Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 17/35] hw: move SCSI controllers to hw/scsi/, " Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 18/35] hw: move more files to hw/xen/ Paolo Bonzini
2013-04-02 14:58 ` Paolo Bonzini [this message]
2013-04-02 14:58 ` [Qemu-devel] [PATCH 20/35] hw: move ISA bridges and devices to hw/isa/, configure with default-configs/ Paolo Bonzini
2013-04-03 10:42 ` Michael S. Tsirkin
2013-04-03 10:51 ` Michael S. Tsirkin
2013-04-03 11:51 ` Paolo Bonzini
2013-04-03 14:08 ` Michael S. Tsirkin
2013-04-02 14:58 ` [Qemu-devel] [PATCH 21/35] hw: move timer devices to hw/timer/, " Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 22/35] hw: move SD/MMC devices to hw/sd/, " Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 23/35] hw: move PCI bridges to hw/pci/, " Paolo Bonzini
2013-04-02 14:58 ` [Qemu-devel] [PATCH 24/35] hw: move VFIO and ivshmem to hw/pci/ Paolo Bonzini
2013-04-03 10:43 ` Michael S. Tsirkin
2013-04-03 11:53 ` Paolo Bonzini
2013-04-03 14:09 ` Michael S. Tsirkin
2013-04-02 14:58 ` [Qemu-devel] [PATCH 25/35] hw: move DMA controllers to hw/dma/, configure with default-configs/ Paolo Bonzini
2013-04-02 14:59 ` [Qemu-devel] [PATCH 26/35] hw: move interrupt controllers to hw/intc/, " Paolo Bonzini
2013-04-02 14:59 ` [Qemu-devel] [PATCH 27/35] hw: move GPIO interfaces to hw/gpio/, " Paolo Bonzini
2013-04-02 14:59 ` [Qemu-devel] [PATCH 28/35] hw: move NVRAM interfaces to hw/nvram/, " Paolo Bonzini
2013-04-02 14:59 ` [Qemu-devel] [PATCH 29/35] hw: move other devices to hw/misc/, " Paolo Bonzini
2013-04-02 14:59 ` [Qemu-devel] [PATCH 30/35] hw: move ARM CPU cores to hw/cpu/, " Paolo Bonzini
2013-04-02 14:59 ` [Qemu-devel] [PATCH 31/35] hw: move hw/kvm/ to hw/i386/kvm Paolo Bonzini
2013-04-02 14:59 ` [Qemu-devel] [PATCH 32/35] hw: move another file to hw/alpha/ Paolo Bonzini
2013-04-02 14:59 ` [Qemu-devel] [PATCH 33/35] hw: move last file to hw/arm/ Paolo Bonzini
2013-04-02 14:59 ` [Qemu-devel] [PATCH 34/35] MAINTAINERS: update for source code movement Paolo Bonzini
2013-04-02 14:59 ` [Qemu-devel] [PATCH 35/35] hw: move private headers to hw/ subdirectories Paolo Bonzini
2013-04-02 17:01 ` [Qemu-devel] [PATCH v2 00/36] hw/ reorganization, part 2 Stefano Stabellini
2013-04-02 17:23 ` Paolo Bonzini
2013-04-02 17:46 ` Stefano Stabellini
2013-04-02 17:55 ` Paolo Bonzini
2013-04-02 18:19 ` Stefano Stabellini
2013-04-03 10:49 ` Michael S. Tsirkin
2013-04-03 11:06 ` Michael S. Tsirkin
2013-04-03 11:55 ` Paolo Bonzini
2013-04-03 14:07 ` Michael S. Tsirkin
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=1364914749-11141-20-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--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).