diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 13:20:08 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:13 +0200 |
| commit | 31e17060829f26292d4095c93e3408d740ce6f3d (patch) | |
| tree | 81d3dda164a50458522376ac20f0391863c838a2 | |
| parent | 53ed424e09f555598f7af286787a76d9c397e812 (diff) | |
hw: move SSI controllers to hw/ssi/, configure via default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | default-configs/arm-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/microblaze-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/microblazeel-softmmu.mak | 1 | ||||
| -rw-r--r-- | hw/arm/Makefile.objs | 3 | ||||
| -rw-r--r-- | hw/microblaze/Makefile.objs | 4 | ||||
| -rw-r--r-- | hw/ssi/Makefile.objs | 4 | ||||
| -rw-r--r-- | hw/ssi/omap_spi.c (renamed from hw/omap_spi.c) | 0 | ||||
| -rw-r--r-- | hw/ssi/xilinx_spi.c (renamed from hw/xilinx_spi.c) | 0 | ||||
| -rw-r--r-- | hw/ssi/xilinx_spips.c (renamed from hw/xilinx_spips.c) | 0 |
9 files changed, 8 insertions, 6 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 24b0d41114..8eb04e20bf 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 050e273580..ce2630818a 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 db82dd8086..acf22c5bb3 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 45bde58952..6f764e62fe 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 75f5ce6cfe..c65e2aabf1 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 daada5c66a..9555825aca 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 index 11403c411b..11403c411b 100644 --- a/hw/omap_spi.c +++ b/hw/ssi/omap_spi.c diff --git a/hw/xilinx_spi.c b/hw/ssi/xilinx_spi.c index f6bd3bac23..f6bd3bac23 100644 --- a/hw/xilinx_spi.c +++ b/hw/ssi/xilinx_spi.c diff --git a/hw/xilinx_spips.c b/hw/ssi/xilinx_spips.c index b2397f4a42..b2397f4a42 100644 --- a/hw/xilinx_spips.c +++ b/hw/ssi/xilinx_spips.c |