[Qemu-devel] [PATCH 33/35] arm: move remaining files to hw/arm/

[Paolo Bonzini]

Signed-off-by: Paolo Bonzini <address@hidden>
---
 hw/arm/Makefile.objs       | 8 ++++++--
 hw/{ => arm}/a15mpcore.c   | 0
 hw/{ => arm}/a9mpcore.c    | 0
 hw/{ => arm}/arm11mpcore.c | 0
 hw/{ => arm}/strongarm.c   | 0
 5 files changed, 6 insertions(+), 2 deletions(-)
 rename hw/{ => arm}/a15mpcore.c (100%)
 rename hw/{ => arm}/a9mpcore.c (100%)
 rename hw/{ => arm}/arm11mpcore.c (100%)
 rename hw/{ => arm}/strongarm.c (100%)

diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 9ffb911..66d67d3 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -1,14 +1,18 @@
+# CPU cores
 obj-y += arm11mpcore.o a9mpcore.o
 obj-y += a15mpcore.o
+
+# All-in-one devices, should be refactored
 obj-y += strongarm.o
-obj-$(CONFIG_KVM) += kvm/arm_gic.o
 
-obj-y := $(addprefix ../,$(obj-y))
+obj-$(CONFIG_KVM) += ../kvm/arm_gic.o
 
+# Boards
 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
 
+# Devices that require ARMCPU
 obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o
 obj-y += omap1.o omap2.o
diff --git a/hw/a15mpcore.c b/hw/arm/a15mpcore.c
similarity index 100%
rename from hw/a15mpcore.c
rename to hw/arm/a15mpcore.c
diff --git a/hw/a9mpcore.c b/hw/arm/a9mpcore.c
similarity index 100%
rename from hw/a9mpcore.c
rename to hw/arm/a9mpcore.c
diff --git a/hw/arm11mpcore.c b/hw/arm/arm11mpcore.c
similarity index 100%
rename from hw/arm11mpcore.c
rename to hw/arm/arm11mpcore.c
diff --git a/hw/strongarm.c b/hw/arm/strongarm.c
similarity index 100%
rename from hw/strongarm.c
rename to hw/arm/strongarm.c
-- 
1.8.1.4