[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/35] hw: move SSI controllers to hw/ssi/, configur
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 17/35] hw: move SSI controllers to hw/ssi/, configure via default-configs/ |
Date: |
Thu, 4 Apr 2013 21:22:57 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
default-configs/arm-softmmu.mak | 1 +
default-configs/microblaze-softmmu.mak | 1 +
default-configs/microblazeel-softmmu.mak | 1 +
hw/arm/Makefile.objs | 3 +--
hw/microblaze/Makefile.objs | 4 ----
hw/ssi/Makefile.objs | 4 ++++
hw/{ => ssi}/omap_spi.c | 0
hw/{ => ssi}/xilinx_spi.c | 0
hw/{ => ssi}/xilinx_spips.c | 0
9 files changed, 8 insertions(+), 6 deletions(-)
rename hw/{ => ssi}/omap_spi.c (100%)
rename hw/{ => ssi}/xilinx_spi.c (100%)
rename hw/{ => ssi}/xilinx_spips.c (100%)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 24b0d41..8eb04e2 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -52,6 +52,7 @@ CONFIG_EXYNOS4=y
CONFIG_PXA2XX=y
CONFIG_BITBANG_I2C=y
CONFIG_FRAMEBUFFER=y
+CONFIG_XILINX_SPIPS=y
CONFIG_MARVELL_88W8618=y
CONFIG_OMAP=y
CONFIG_BLIZZARD=y
diff --git a/default-configs/microblaze-softmmu.mak
b/default-configs/microblaze-softmmu.mak
index 050e273..ce26308 100644
--- a/default-configs/microblaze-softmmu.mak
+++ b/default-configs/microblaze-softmmu.mak
@@ -5,6 +5,7 @@ CONFIG_PFLASH_CFI01=y
CONFIG_SERIAL=y
CONFIG_XILINX=y
CONFIG_XILINX_AXI=y
+CONFIG_XILINX_SPI=y
CONFIG_XILINX_ETHLITE=y
CONFIG_SSI=y
CONFIG_SSI_M25P80=y
diff --git a/default-configs/microblazeel-softmmu.mak
b/default-configs/microblazeel-softmmu.mak
index db82dd8..acf22c5 100644
--- a/default-configs/microblazeel-softmmu.mak
+++ b/default-configs/microblazeel-softmmu.mak
@@ -5,6 +5,7 @@ CONFIG_PFLASH_CFI01=y
CONFIG_SERIAL=y
CONFIG_XILINX=y
CONFIG_XILINX_AXI=y
+CONFIG_XILINX_SPI=y
CONFIG_XILINX_ETHLITE=y
CONFIG_SSI=y
CONFIG_SSI_M25P80=y
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 45bde58..6f764e6 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -1,5 +1,4 @@
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 arm_sysctl.o arm11mpcore.o a9mpcore.o
@@ -15,7 +14,7 @@ obj-y += zaurus.o
obj-y += omap_dma.o omap_clk.o omap_mmc.o \
omap_gpio.o omap_intc.o omap_uart.o
obj-y += soc_dma.o omap_gptimer.o omap_synctimer.o \
- omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.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
diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs
index 75f5ce6..c65e2aa 100644
--- a/hw/microblaze/Makefile.objs
+++ b/hw/microblaze/Makefile.objs
@@ -1,7 +1,3 @@
-obj-y += xilinx_spi.o
-
-obj-y := $(addprefix ../,$(obj-y))
-
obj-y += petalogix_s3adsp1800_mmu.o
obj-y += petalogix_ml605_mmu.o
obj-y += boot.o
diff --git a/hw/ssi/Makefile.objs b/hw/ssi/Makefile.objs
index daada5c..9555825 100644
--- a/hw/ssi/Makefile.objs
+++ b/hw/ssi/Makefile.objs
@@ -1,2 +1,6 @@
common-obj-$(CONFIG_PL022) += pl022.o
common-obj-$(CONFIG_SSI) += ssi.o
+common-obj-$(CONFIG_XILINX_SPI) += xilinx_spi.o
+common-obj-$(CONFIG_XILINX_SPIPS) += xilinx_spips.o
+
+obj-$(CONFIG_OMAP) += omap_spi.o
diff --git a/hw/omap_spi.c b/hw/ssi/omap_spi.c
similarity index 100%
rename from hw/omap_spi.c
rename to hw/ssi/omap_spi.c
diff --git a/hw/xilinx_spi.c b/hw/ssi/xilinx_spi.c
similarity index 100%
rename from hw/xilinx_spi.c
rename to hw/ssi/xilinx_spi.c
diff --git a/hw/xilinx_spips.c b/hw/ssi/xilinx_spips.c
similarity index 100%
rename from hw/xilinx_spips.c
rename to hw/ssi/xilinx_spips.c
--
1.8.1.4
- [Qemu-devel] [PATCH 07/35] hw: make all of hw/ide/ configurable via default-configs/, (continued)
- [Qemu-devel] [PATCH 07/35] hw: make all of hw/ide/ configurable via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 08/35] hw: make all of hw/usb/ configurable via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 10/35] hw: move watchdogs to hw/watchdog, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 09/35] hw: make all of hw/pci/ configurable via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 13/35] hw: move block devices to hw/block/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 05/35] hw: move target-independent files to subdirectories, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 11/35] hw: move MC146818RTC to hw/timer/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 12/35] hw: move NICs to hw/net/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 14/35] hw: move audio devices to hw/audio/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 15/35] hw: move display devices to hw/display/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 17/35] hw: move SSI controllers to hw/ssi/, configure via default-configs/,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 16/35] hw: move I2C controllers to hw/i2c/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 18/35] hw: move SCSI controllers to hw/scsi/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 19/35] hw: move more files to hw/xen/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 21/35] hw: move ISA bridges and devices to hw/isa/, configure with default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 20/35] hw: move char devices to hw/char/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 25/35] hw: move VFIO and ivshmem to hw/misc/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 23/35] hw: move SD/MMC devices to hw/sd/, configure with default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 26/35] hw: move DMA controllers to hw/dma/, configure with default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 24/35] hw: move PCI bridges to hw/pci-* or hw/ARCH, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 28/35] hw: move GPIO interfaces to hw/gpio/, configure with default-configs/, Paolo Bonzini, 2013/04/04