]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
hw: move char devices to hw/char/, configure via default-configs/
authorPaolo Bonzini <pbonzini@redhat.com>
Tue, 5 Feb 2013 12:35:34 +0000 (13:35 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 8 Apr 2013 16:13:14 +0000 (18:13 +0200)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
29 files changed:
default-configs/arm-softmmu.mak
default-configs/i386-softmmu.mak
default-configs/lm32-softmmu.mak
default-configs/s390x-softmmu.mak
default-configs/sparc-softmmu.mak
default-configs/x86_64-softmmu.mak
hw/arm/Makefile.objs
hw/char/Makefile.objs
hw/char/debugcon.c [moved from hw/debugcon.c with 100% similarity]
hw/char/etraxfs_ser.c [moved from hw/etraxfs_ser.c with 98% similarity]
hw/char/exynos4210_uart.c [moved from hw/exynos4210_uart.c with 100% similarity]
hw/char/grlib_apbuart.c [moved from hw/grlib_apbuart.c with 100% similarity]
hw/char/imx_serial.c [moved from hw/imx_serial.c with 100% similarity]
hw/char/lm32_juart.c [moved from hw/lm32_juart.c with 100% similarity]
hw/char/lm32_uart.c [moved from hw/lm32_uart.c with 100% similarity]
hw/char/mcf_uart.c [moved from hw/mcf_uart.c with 100% similarity]
hw/char/milkymist-uart.c [moved from hw/milkymist-uart.c with 100% similarity]
hw/char/omap_uart.c [moved from hw/omap_uart.c with 100% similarity]
hw/char/sclpconsole.c [moved from hw/s390x/sclpconsole.c with 99% similarity]
hw/char/sh_serial.c [moved from hw/sh_serial.c with 100% similarity]
hw/char/spapr_vty.c [moved from hw/spapr_vty.c with 100% similarity]
hw/cris/Makefile.objs
hw/i386/Makefile.objs
hw/lm32/Makefile.objs
hw/m68k/Makefile.objs
hw/ppc/Makefile.objs
hw/s390x/Makefile.objs
hw/sh4/Makefile.objs
hw/sparc/Makefile.objs

index 8eb04e20bf028f743637127159b90e9f007bd7bc..8da5ec857edb3a80b71a791db51bc9ee7c2e0b81 100644 (file)
@@ -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
index 89aaff5faaee89ccae3fae75e43cda20d135d69a..9d852ff2d82c13e0fc050f8d97977256d132ab67 100644 (file)
@@ -34,3 +34,4 @@ CONFIG_MC146818RTC=y
 CONFIG_WDT_IB700=y
 CONFIG_PC_SYSFW=y
 CONFIG_XEN_I386=$(CONFIG_XEN)
+CONFIG_ISA_DEBUG=y
index 6b2ee430e5620fe8d1e6450c3b519266f5a0aa90..ef0f4bae72d1776718ad7f522dbab5a37c448327 100644 (file)
@@ -1,5 +1,6 @@
 # Default configuration for lm32-softmmu
 
+CONFIG_LM32=y
 CONFIG_MILKYMIST=y
 CONFIG_FRAMEBUFFER=y
 CONFIG_PTIMER=y
index 30057292047c1a905095f0ba2172ea78362a26aa..81fbc6865491bda5494b697efd7c221f7d3c2a7f 100644 (file)
@@ -1 +1,2 @@
 CONFIG_VIRTIO=y
+CONFIG_SCLPCONSOLE=y
index 25bcbe38bc781b50485dfd6210f1f5ef321b600b..da5b02d40517412b1041702640f8c2fbf51dfc73 100644 (file)
@@ -11,3 +11,4 @@ CONFIG_PCNET_COMMON=y
 CONFIG_LANCE=y
 CONFIG_TCX=y
 CONFIG_CS4231=y
+CONFIG_GRLIB=y
index c34f8f87597e7f81ce327dc535efe4d89ac31ae2..760d51e663ef9db9cccdabc7ada005f1f95df176 100644 (file)
@@ -34,3 +34,4 @@ CONFIG_MC146818RTC=y
 CONFIG_WDT_IB700=y
 CONFIG_PC_SYSFW=y
 CONFIG_XEN_I386=$(CONFIG_XEN)
+CONFIG_ISA_DEBUG=y
index 6f764e62fee6c1c116a62b1d989bdb3ff077d2a9..26e107f93c411ba15482ba45a677b23feb0f5bf6 100644 (file)
@@ -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))
index ddfd3ec9cb10e4aa4662d1b6c20932c6ec08c96b..f8f3dbca3e2a498d49076893ff4ad20f9e741eac 100644 (file)
@@ -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_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_ETRAXFS) += etraxfs_ser.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
+common-obj-$(CONFIG_SCLPCONSOLE) += sclpconsole.o
+
 obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o
similarity index 100%
rename from hw/debugcon.c
rename to hw/char/debugcon.c
similarity index 98%
rename from hw/etraxfs_ser.c
rename to hw/char/etraxfs_ser.c
index 7e24d34230ade124e976edbf9c6f8fb5be25a22d..b7499d775bf4cf23e31d452fd69cf0be26bb87cd 100644 (file)
@@ -78,7 +78,6 @@ static uint64_t
 ser_read(void *opaque, hwaddr addr, unsigned int size)
 {
     struct etrax_serial *s = opaque;
-    D(CPUCRISState *env = s->env);
     uint32_t r = 0;
 
     addr >>= 2;
@@ -116,7 +115,6 @@ ser_write(void *opaque, hwaddr addr,
     struct etrax_serial *s = opaque;
     uint32_t value = val64;
     unsigned char ch = val64;
-    D(CPUCRISState *env = s->env);
 
     D(qemu_log("%s " TARGET_FMT_plx "=%x\n",  __func__, addr, value));
     addr >>= 2;
similarity index 100%
rename from hw/grlib_apbuart.c
rename to hw/char/grlib_apbuart.c
similarity index 100%
rename from hw/imx_serial.c
rename to hw/char/imx_serial.c
similarity index 100%
rename from hw/lm32_juart.c
rename to hw/char/lm32_juart.c
similarity index 100%
rename from hw/lm32_uart.c
rename to hw/char/lm32_uart.c
similarity index 100%
rename from hw/mcf_uart.c
rename to hw/char/mcf_uart.c
similarity index 100%
rename from hw/milkymist-uart.c
rename to hw/char/milkymist-uart.c
similarity index 100%
rename from hw/omap_uart.c
rename to hw/char/omap_uart.c
similarity index 99%
rename from hw/s390x/sclpconsole.c
rename to hw/char/sclpconsole.c
index 5c881e5f3f940e584e85fd9cd8680984d3eb87c5..42ed54c9abbdf8d2edc982f7368d8cae27f4fbc4 100644 (file)
@@ -234,7 +234,7 @@ static int write_event_data(SCLPEvent *event, EventBufferHeader *evt_buf_hdr)
     return rc;
 }
 
-static void trigger_ascii_console_data(void *env, int n, int level)
+static void trigger_ascii_console_data(void *opaque, int n, int level)
 {
     sclp_service_interrupt(0);
 }
similarity index 100%
rename from hw/sh_serial.c
rename to hw/char/sh_serial.c
similarity index 100%
rename from hw/spapr_vty.c
rename to hw/char/spapr_vty.c
index e02365d5cdc0b841672e23458e13d89edb4ac7ae..c4d5189fc05d2a9e9dae55134c4f1fae9ec285c8 100644 (file)
@@ -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))
 
index c85bb3df1bc00e001df340e70b3ee4be5febf996..5e91d1e669b7d58882057be2259c10a6d917a79d 100644 (file)
@@ -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
index a894c466ca7f956d24cd14a7b7306c434dc72bc4..e1161566adf376f799acc7a9d610447c6b13ce50 100644 (file)
@@ -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))
 
index ebbe0038042f5a3cd59d5fb855cf149922237f96..c4352e783ad5902d780b5dd06ff074cca7c9e85c 100644 (file)
@@ -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
 
index 2d51ae9b42f57c9dbb0c1c9c8fcbc12118c6fe8a..1e24b582826ae4363158859f1fcb32f0e728aa8e 100644 (file)
@@ -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
index 9f2f41989c50ef17775642dcd865645ee6f7b43f..77e1218447a641930263d20517a2948dc89fdba9 100644 (file)
@@ -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
index c9b0416b077b58013ecd5362d475f7f90959f414..10c971a3006ebf4b280bf2ceb899c4d08943b46b 100644 (file)
@@ -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))
 
index 235461696848be0590927edebf91bb41242c928c..e18bc67fc7ebdbefad0b4b38e7f1a49c900b0af6 100644 (file)
@@ -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))