diff options
| -rw-r--r-- | default-configs/sparc-softmmu.mak | 2 | ||||
| -rw-r--r-- | hw/arm/Makefile.objs | 7 | ||||
| -rw-r--r-- | hw/cris/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/dma/Makefile.objs | 6 | ||||
| -rw-r--r-- | hw/dma/etraxfs_dma.c (renamed from hw/etraxfs_dma.c) | 0 | ||||
| -rw-r--r-- | hw/dma/omap_dma.c (renamed from hw/omap_dma.c) | 0 | ||||
| -rw-r--r-- | hw/dma/pxa2xx_dma.c (renamed from hw/pxa2xx_dma.c) | 0 | ||||
| -rw-r--r-- | hw/dma/soc_dma.c (renamed from hw/soc_dma.c) | 0 | ||||
| -rw-r--r-- | hw/dma/sparc32_dma.c (renamed from hw/sparc32_dma.c) | 0 | ||||
| -rw-r--r-- | hw/dma/sun4m_iommu.c (renamed from hw/sun4m_iommu.c) | 3 | ||||
| -rw-r--r-- | hw/sparc/Makefile.objs | 4 |
11 files changed, 13 insertions, 10 deletions
diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index 6a2bad3962..8c4d0a6886 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -13,3 +13,5 @@ CONFIG_TCX=y CONFIG_SLAVIO=y CONFIG_CS4231=y CONFIG_GRLIB=y +CONFIG_STP2000=y +CONFIG_SUN4M=y diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 8e8e799076..59b5cf69cb 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -6,13 +6,10 @@ obj-y += exynos4210_gic.o exynos4210_combiner.o obj-y += exynos4210_pmu.o obj-y += a15mpcore.o obj-y += armv7m_nvic.o -obj-y += pxa2xx_dma.o obj-y += pxa2xx_pcmcia.o obj-y += zaurus.o -obj-y += omap_dma.o omap_clk.o \ - omap_gpio.o omap_intc.o -obj-y += soc_dma.o \ - omap_gpmc.o omap_sdrc.o omap_tap.o omap_l4.o +obj-y += omap_clk.o omap_gpio.o omap_intc.o +obj-y += omap_gpmc.o omap_sdrc.o omap_tap.o omap_l4.o obj-y += cbus.o obj-y += mst_fpga.o obj-y += strongarm.o diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs index a8a4a9efcf..f8c85a4520 100644 --- a/hw/cris/Makefile.objs +++ b/hw/cris/Makefile.objs @@ -1,5 +1,4 @@ # IO blocks -obj-y += etraxfs_dma.o obj-y += etraxfs_pic.o obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs index bce31cdf87..0e65ed0d74 100644 --- a/hw/dma/Makefile.objs +++ b/hw/dma/Makefile.objs @@ -5,3 +5,9 @@ common-obj-$(CONFIG_PL330) += pl330.o common-obj-$(CONFIG_I82374) += i82374.o common-obj-$(CONFIG_I8257) += i8257.o common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o +common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o +common-obj-$(CONFIG_STP2000) += sparc32_dma.o +common-obj-$(CONFIG_SUN4M) += sun4m_iommu.o + +obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o +obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o diff --git a/hw/etraxfs_dma.c b/hw/dma/etraxfs_dma.c index 6a8c222502..6a8c222502 100644 --- a/hw/etraxfs_dma.c +++ b/hw/dma/etraxfs_dma.c diff --git a/hw/omap_dma.c b/hw/dma/omap_dma.c index 184fcee1a7..184fcee1a7 100644 --- a/hw/omap_dma.c +++ b/hw/dma/omap_dma.c diff --git a/hw/pxa2xx_dma.c b/hw/dma/pxa2xx_dma.c index 6e4c1f6d62..6e4c1f6d62 100644 --- a/hw/pxa2xx_dma.c +++ b/hw/dma/pxa2xx_dma.c diff --git a/hw/soc_dma.c b/hw/dma/soc_dma.c index 5e3491d373..5e3491d373 100644 --- a/hw/soc_dma.c +++ b/hw/dma/soc_dma.c diff --git a/hw/sparc32_dma.c b/hw/dma/sparc32_dma.c index fd21533f15..fd21533f15 100644 --- a/hw/sparc32_dma.c +++ b/hw/dma/sparc32_dma.c diff --git a/hw/sun4m_iommu.c b/hw/dma/sun4m_iommu.c index 744b5846b1..8312bff5fe 100644 --- a/hw/sun4m_iommu.c +++ b/hw/dma/sun4m_iommu.c @@ -258,8 +258,7 @@ static uint32_t iommu_page_get_flags(IOMMUState *s, hwaddr addr) iopte = s->regs[IOMMU_BASE] << 4; addr &= ~s->iostart; iopte += (addr >> (IOMMU_PAGE_SHIFT - 2)) & ~3; - cpu_physical_memory_read(iopte, (uint8_t *)&ret, 4); - tswap32s(&ret); + ret = ldl_be_phys(iopte); trace_sun4m_iommu_page_get_flags(pa, iopte, ret); return ret; } diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs index ab1d91c2b9..3de10ff08c 100644 --- a/hw/sparc/Makefile.objs +++ b/hw/sparc/Makefile.objs @@ -1,5 +1,5 @@ -obj-y = sun4m_iommu.o slavio_intctl.o -obj-y += slavio_misc.o sparc32_dma.o +obj-y = slavio_intctl.o +obj-y += slavio_misc.o obj-y += eccmemctl.o sbi.o sun4c_intctl.o # GRLIB |