[Qemu-devel] [PATCH] default-configs: Fix A9MP and A15MP config names

[Qemu-devel] [PATCH] default-configs: Fix A9MP and A15MP config names

[Peter Maydell]

When individual CONFIG_ switches for the A9MPcore and A15MPcore
devices were created, they were inadvertently given incorrect names
(CONFIG_ARM9MPCORE and CONFIG_ARM15MPCORE). These CPUs are
"Cortex-A9MP" and "Cortex-A15MP", and in particular the ARM9 is
a different (rather older) CPU than the Cortex-A9. Rename the
CONFIG_ switches to bring them into line with the source file
names and CPU names.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 default-configs/arm-softmmu.mak |    4 ++--
 hw/cpu/Makefile.objs            |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 27cbe3d..ac0815d 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -34,9 +34,9 @@ CONFIG_PFLASH_CFI02=y
 CONFIG_MICRODRIVE=y
 CONFIG_USB_MUSB=y
 
-CONFIG_ARM9MPCORE=y
 CONFIG_ARM11MPCORE=y
-CONFIG_ARM15MPCORE=y
+CONFIG_A9MPCORE=y
+CONFIG_A15MPCORE=y
 
 CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_KVM=$(CONFIG_KVM)
diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs
index 4461ece..df287c1 100644
--- a/hw/cpu/Makefile.objs
+++ b/hw/cpu/Makefile.objs
@@ -1,5 +1,5 @@
 obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o
-obj-$(CONFIG_ARM9MPCORE) += a9mpcore.o
-obj-$(CONFIG_ARM15MPCORE) += a15mpcore.o
+obj-$(CONFIG_A9MPCORE) += a9mpcore.o
+obj-$(CONFIG_A15MPCORE) += a15mpcore.o
 obj-$(CONFIG_ICC_BUS) += icc_bus.o
 
-- 
1.7.9.5

Re: [Qemu-devel] [PATCH] default-configs: Fix A9MP and A15MP config names

[Peter Maydell]

On 9 August 2013 14:50, Peter Maydell <peter.maydell@linaro.org> wrote:
> When individual CONFIG_ switches for the A9MPcore and A15MPcore
> devices were created, they were inadvertently given incorrect names
> (CONFIG_ARM9MPCORE and CONFIG_ARM15MPCORE). These CPUs are
> "Cortex-A9MP" and "Cortex-A15MP", and in particular the ARM9 is
> a different (rather older) CPU than the Cortex-A9. Rename the
> CONFIG_ switches to bring them into line with the source file
> names and CPU names.
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Applying to target-arm.next.

-- PMM