[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 05/11] target/arm: Restrict ARMv6 cpus to TCG accel
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v5 05/11] target/arm: Restrict ARMv6 cpus to TCG accel |
Date: |
Sat, 30 Jan 2021 02:52:21 +0100 |
KVM requires a cpu based on (at least) the ARMv7 architecture.
Only enable the following ARMv6 CPUs when TCG is available:
- ARM1136
- ARM1176
- ARM11MPCore
- Cortex-M0
The following machines are no more built when TCG is disabled:
- kzm ARM KZM Emulation Baseboard (ARM1136)
- microbit BBC micro:bit (Cortex-M0)
- n800 Nokia N800 tablet aka. RX-34 (OMAP2420)
- n810 Nokia N810 tablet aka. RX-44 (OMAP2420)
- realview-eb-mpcore ARM RealView Emulation Baseboard (ARM11MPCore)
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
default-configs/devices/arm-softmmu.mak | 2 --
hw/arm/realview.c | 2 +-
hw/arm/Kconfig | 11 +++++++++++
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/default-configs/devices/arm-softmmu.mak
b/default-configs/devices/arm-softmmu.mak
index 5b25fafc9ab..ee80bf15150 100644
--- a/default-configs/devices/arm-softmmu.mak
+++ b/default-configs/devices/arm-softmmu.mak
@@ -10,9 +10,7 @@ CONFIG_ARM_VIRT=y
CONFIG_CUBIEBOARD=y
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
-CONFIG_FSL_IMX31=y
CONFIG_MUSCA=y
-CONFIG_NSERIES=y
CONFIG_STELLARIS=y
CONFIG_REALVIEW=y
CONFIG_VEXPRESS=y
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index cd37b501287..57a37608e39 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -463,8 +463,8 @@ static void realview_machine_init(void)
{
if (tcg_enabled()) {
type_register_static(&realview_eb_type);
+ type_register_static(&realview_eb_mpcore_type);
}
- type_register_static(&realview_eb_mpcore_type);
type_register_static(&realview_pb_a8_type);
type_register_static(&realview_pbx_a9_type);
}
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index bdb8c63af7b..daab7081994 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -6,6 +6,11 @@ config ARM_V5
bool
depends on TCG
+config ARM_V6
+ bool
+ depends on TCG
+ select ARM_COMPATIBLE_SEMIHOSTING
+
config ARM_VIRT
bool
imply PCI_DEVICES
@@ -131,6 +136,8 @@ config NETDUINOPLUS2
config NSERIES
bool
+ default y if TCG
+ select ARM_V6
select OMAP
select TMP105 # tempature sensor
select BLIZZARD # LCD/TV controller
@@ -411,6 +418,8 @@ config FSL_IMX25
config FSL_IMX31
bool
+ default y if TCG
+ select ARM_V6
select SERIAL
select IMX
select IMX_I2C
@@ -488,11 +497,13 @@ config FSL_IMX6UL
config MICROBIT
bool
+ default y if TCG
select NRF51_SOC
config NRF51_SOC
bool
select I2C
+ select ARM_V6
select ARM_V7M
select UNIMP
--
2.26.2
- [PATCH v5 00/11] Support disabling TCG on ARM (part 2), Philippe Mathieu-Daudé, 2021/01/29
- [PATCH v5 04/11] target/arm: Restrict ARMv5 cpus to TCG accel, Philippe Mathieu-Daudé, 2021/01/29
- [PATCH v5 05/11] target/arm: Restrict ARMv6 cpus to TCG accel,
Philippe Mathieu-Daudé <=
- [PATCH v5 06/11] target/arm: Restrict ARMv7 R-profile cpus to TCG accel, Philippe Mathieu-Daudé, 2021/01/29
- [PATCH v5 07/11] target/arm: Restrict ARMv7 M-profile cpus to TCG accel, Philippe Mathieu-Daudé, 2021/01/29
- [PATCH v5 08/11] target/arm: Make m_helper.c optional via CONFIG_ARM_V7M, Philippe Mathieu-Daudé, 2021/01/29
- [PATCH v5 09/11] target/arm: Reorder meson.build rules, Philippe Mathieu-Daudé, 2021/01/29
- [PATCH v5 10/11] target/arm: Do not build TCG objects when TCG is off, Philippe Mathieu-Daudé, 2021/01/29
- [PATCH v5 11/11] .travis.yml: Add a KVM-only Aarch64 job, Philippe Mathieu-Daudé, 2021/01/29