diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-20 15:36:02 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-28 16:18:49 +0000 |
| commit | 743eb705608f21999356dd1bcefd4733f1c959e6 (patch) | |
| tree | 8bc6e23fe703d5263234c1182bc19581a6feaace /default-configs | |
| parent | f68d881c9b2acee616b3baa7cc00a94a72f518f5 (diff) | |
| download | qemu-743eb705608f21999356dd1bcefd4733f1c959e6.zip qemu-743eb705608f21999356dd1bcefd4733f1c959e6.tar.gz qemu-743eb705608f21999356dd1bcefd4733f1c959e6.tar.bz2 | |
armv7m: Don't put core v7M devices under CONFIG_STELLARIS
The NVIC is a core v7M device that exists for all v7M CPUs;
put it under a CONFIG_ARM_V7M rather than hiding it under
CONFIG_STELLARIS.
(We'll use CONFIG_ARM_V7M for the SysTick device too
when we split it out of the NVIC.)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 1487604965-23220-9-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'default-configs')
| -rw-r--r-- | default-configs/arm-softmmu.mak | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index fdf4089..1e3bd2b 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -42,6 +42,8 @@ CONFIG_ARM11MPCORE=y CONFIG_A9MPCORE=y CONFIG_A15MPCORE=y +CONFIG_ARM_V7M=y + CONFIG_ARM_GIC=y CONFIG_ARM_GIC_KVM=$(CONFIG_KVM) CONFIG_ARM_TIMER=y |