[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 20/21] default-configs: Fix A9MP and A15MP config nam
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 20/21] default-configs: Fix A9MP and A15MP config names |
Date: |
Tue, 20 Aug 2013 15:07:59 +0100 |
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 <address@hidden>
Message-id: address@hidden
---
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
- [Qemu-devel] [PULL 08/21] hw/arm/musicpal: Don't use arm_pic_init_cpu(), (continued)
- [Qemu-devel] [PULL 08/21] hw/arm/musicpal: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 13/21] hw/arm/vexpress: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 11/21] hw/arm/strongarm: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 07/21] hw/arm/kzm: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 12/21] hw/arm/versatilepb: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 05/21] hw/arm/highbank: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 16/21] target-arm: Allow raw_read() and raw_write() to handle 64 bit regs, Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 17/21] target-arm: Support coprocessor registers which do I/O, Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 01/21] target-arm: Implement 'int' loglevel, Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 21/21] hw/timer/imx_epit: Simplify and fix imx_epit implementation, Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 20/21] default-configs: Fix A9MP and A15MP config names,
Peter Maydell <=
- [Qemu-devel] [PULL 14/21] hw/arm/xilinx_zynq: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 19/21] hw/cpu/a15mpcore: Wire generic timer outputs to GIC inputs, Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 09/21] hw/arm/omap*: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 03/21] hw/arm/armv7m: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 18/21] target-arm: Implement the generic timer, Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 15/21] hw/arm/pic_cpu: Remove the now-unneeded arm_pic_init_cpu(), Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 02/21] target-arm: Make IRQ and FIQ gpio lines on the CPU object, Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 10/21] hw/arm/realview: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 04/21] hw/arm/exynos4210: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/20
- [Qemu-devel] [PULL 06/21] hw/arm/integratorcp: Don't use arm_pic_init_cpu(), Peter Maydell, 2013/08/20