hw: move ARM CPU cores to hw/cpu/, configure with default-configs/

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2013-02-05 16:36:44 +01:00 · 2013-02-05 16:36:44 +01:00 · 0434e30afb
parent e28bee8ee6
commit 0434e30afb
6 changed files with 8 additions and 2 deletions
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@ -34,6 +34,10 @@ CONFIG_PFLASH_CFI02=y
 CONFIG_MICRODRIVE=y
 CONFIG_USB_MUSB=y

+CONFIG_ARM5MPCORE=y
+CONFIG_ARM9MPCORE=y
+CONFIG_ARM15MPCORE=y
+
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_KVM=$(CONFIG_KVM)
 CONFIG_ARM_TIMER=y
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@ -1,5 +1,3 @@
-obj-y += arm11mpcore.o a9mpcore.o
-obj-y += a15mpcore.o
 obj-y += strongarm.o

 obj-y := $(addprefix ../,$(obj-y))
--- a/hw/cpu/Makefile.objs
+++ b/hw/cpu/Makefile.objs
@ -0,0 +1,4 @@
+obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o
+obj-$(CONFIG_ARM9MPCORE) += a9mpcore.o
+obj-$(CONFIG_ARM15MPCORE) += a15mpcore.o
+
--- a/hw/cpu/a15mpcore.c
+++ b/hw/cpu/a15mpcore.c
--- a/hw/cpu/a9mpcore.c
+++ b/hw/cpu/a9mpcore.c
--- a/hw/cpu/arm11mpcore.c
+++ b/hw/cpu/arm11mpcore.c