aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-03-27 18:49:23 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2013-04-08 18:13:16 +0200
commitaacf8895e13c3763ce6d30a4e673ebcc6326d9ff (patch)
treebb88c8ffbbbe36c61e17490ee47d038e2583f25d
parent54976b75fb159ca175636b7fef1cd08130cb662f (diff)
hw: move last file to hw/arm/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--hw/arm/Makefile.objs6
-rw-r--r--hw/arm/strongarm.c (renamed from hw/strongarm.c)0
2 files changed, 1 insertions, 5 deletions
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 35c5f11cca..9e3a06fc18 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -1,11 +1,7 @@
-obj-y += strongarm.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
+obj-y += omap1.o omap2.o strongarm.o
diff --git a/hw/strongarm.c b/hw/arm/strongarm.c
index 0e5262d9f5..0e5262d9f5 100644
--- a/hw/strongarm.c
+++ b/hw/arm/strongarm.c