diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 16:36:44 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:16 +0200 |
| commit | 0434e30afb6175212389811e0b28b948eb3c1e40 (patch) | |
| tree | 1e620f6e6078232b2d86322da51874df4e4d1960 | |
| parent | e28bee8ee654b81f4688a505e56ade0692174b5c (diff) | |
hw: move ARM CPU cores to hw/cpu/, configure with default-configs/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | default-configs/arm-softmmu.mak | 4 | ||||
| -rw-r--r-- | hw/arm/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/cpu/Makefile.objs | 4 | ||||
| -rw-r--r-- | hw/cpu/a15mpcore.c (renamed from hw/a15mpcore.c) | 0 | ||||
| -rw-r--r-- | hw/cpu/a9mpcore.c (renamed from hw/a9mpcore.c) | 0 | ||||
| -rw-r--r-- | hw/cpu/arm11mpcore.c (renamed from hw/arm11mpcore.c) | 0 |
6 files changed, 8 insertions, 2 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index e03840ec5..31725a97f 100644 --- 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 diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index cb94927e4..35c5f11cc 100644 --- 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)) diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs index e69de29bb..a49ca0428 100644 --- 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 + diff --git a/hw/a15mpcore.c b/hw/cpu/a15mpcore.c index 648656d5b..648656d5b 100644 --- a/hw/a15mpcore.c +++ b/hw/cpu/a15mpcore.c diff --git a/hw/a9mpcore.c b/hw/cpu/a9mpcore.c index 0a1a10f37..0a1a10f37 100644 --- a/hw/a9mpcore.c +++ b/hw/cpu/a9mpcore.c diff --git a/hw/arm11mpcore.c b/hw/cpu/arm11mpcore.c index 90dceade7..90dceade7 100644 --- a/hw/arm11mpcore.c +++ b/hw/cpu/arm11mpcore.c |