Browse Source
* bonzini/hw-dirs: sh: move files referencing CPU to hw/sh4/ ppc: move more files to hw/ppc ppc: move files referencing CPU to hw/ppc/ m68k: move files referencing CPU to hw/m68k/ i386: move files referencing CPU to hw/i386/ arm: move files referencing CPU to hw/arm/ hw: move boards and other isolated files to hw/ARCH ppc: express FDT dependency of pSeries and e500 boards via default-configs/ build: always link device_tree.o into emulators if libfdt available hw: include hw header files with full paths ppc: do not use ../ in include files vt82c686: vt82c686 is not a PCI host bridge virtio-9p: remove PCI dependencies from hw/9pfs/ virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX hw: move device-hotplug.o to toplevel, compile it once hw: move qdev-monitor.o to toplevel directory hw: move fifo.[ch] to libqemuutil hw: move char backends to backends/ Conflicts: backends/baum.c backends/msmouse.c hw/a15mpcore.c hw/arm/Makefile.objs hw/arm/pic_cpu.c hw/dataplane/event-poll.c hw/dataplane/virtio-blk.c include/char/baum.h include/char/msmouse.h qemu-char.c vl.c Resolve conflicts caused by header movements. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>pull/2/head
Anthony Liguori
13 years ago
537 changed files with 1808 additions and 1780 deletions
@ -1,2 +1,6 @@ |
|||
common-obj-y += rng.o rng-egd.o |
|||
common-obj-$(CONFIG_POSIX) += rng-random.o |
|||
|
|||
common-obj-y += msmouse.o |
|||
common-obj-$(CONFIG_BRLAPI) += baum.o |
|||
$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS) |
|||
|
|||
@ -1,4 +1,6 @@ |
|||
obj-y = mc146818rtc.o |
|||
obj-y += alpha_pci.o alpha_dp264.o alpha_typhoon.o |
|||
obj-y += alpha_typhoon.o |
|||
|
|||
obj-y := $(addprefix ../,$(obj-y)) |
|||
|
|||
obj-y += dp264.o pci.o |
|||
|
|||
@ -1,37 +1,37 @@ |
|||
obj-y = integratorcp.o versatilepb.o arm_pic.o |
|||
obj-y += arm_boot.o |
|||
obj-y += xilinx_zynq.o zynq_slcr.o |
|||
obj-y += zynq_slcr.o |
|||
obj-y += xilinx_spips.o |
|||
obj-y += arm_gic.o arm_gic_common.o |
|||
obj-y += a9scu.o |
|||
obj-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o |
|||
obj-y += exynos4210_gic.o exynos4210_combiner.o exynos4210.o |
|||
obj-y += exynos4_boards.o exynos4210_uart.o exynos4210_pwm.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_pmu.o exynos4210_mct.o exynos4210_fimd.o |
|||
obj-y += exynos4210_rtc.o exynos4210_i2c.o |
|||
obj-y += arm_mptimer.o a15mpcore.o |
|||
obj-y += armv7m.o armv7m_nvic.o stellaris.o stellaris_enet.o |
|||
obj-y += highbank.o |
|||
obj-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o |
|||
obj-y += armv7m_nvic.o stellaris_enet.o |
|||
obj-y += pxa2xx_timer.o pxa2xx_dma.o |
|||
obj-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o |
|||
obj-y += gumstix.o |
|||
obj-y += zaurus.o ide/microdrive.o spitz.o tosa.o tc6393xb.o |
|||
obj-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \
|
|||
obj-y += zaurus.o ide/microdrive.o tc6393xb.o |
|||
obj-y += omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \
|
|||
omap_gpio.o omap_intc.o omap_uart.o |
|||
obj-y += omap2.o omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \
|
|||
obj-y += omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \
|
|||
omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o |
|||
obj-y += omap_sx1.o palm.o tsc210x.o |
|||
obj-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o |
|||
obj-y += mst_fpga.o mainstone.o |
|||
obj-y += z2.o |
|||
obj-y += musicpal.o bitbang_i2c.o marvell_88w8618_audio.o |
|||
obj-y += tsc210x.o |
|||
obj-y += blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o |
|||
obj-y += mst_fpga.o |
|||
obj-y += bitbang_i2c.o marvell_88w8618_audio.o |
|||
obj-y += framebuffer.o |
|||
obj-y += vexpress.o |
|||
obj-y += strongarm.o |
|||
obj-y += collie.o |
|||
obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o |
|||
obj-y += kzm.o |
|||
obj-$(CONFIG_FDT) += ../device_tree.o |
|||
obj-$(CONFIG_KVM) += kvm/arm_gic.o |
|||
|
|||
obj-y := $(addprefix ../,$(obj-y)) |
|||
|
|||
obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o |
|||
obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o |
|||
obj-y += omap_sx1.o palm.o pic_cpu.o realview.o spitz.o stellaris.o |
|||
obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o |
|||
|
|||
obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o |
|||
obj-y += omap1.o omap2.o |
|||
|
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue