KVM requires the target cpu to be at least ARMv8 architecture
(support on ARMv7 has been dropped in commit 82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").
Only enable the following ARMv4 CPUs when TCG is available:
- StrongARM (SA1100/1110)
- OMAP1510 (TI925T)
The following machines are no more built when TCG is disabled:
- cheetah Palm Tungsten|E aka. Cheetah PDA (OMAP310)
- sx1 Siemens SX1 (OMAP310) V2
- sx1-v1 Siemens SX1 (OMAP310) V1
Signed-off-by: Philippe Mathieu-Daudé <f4bug@xxxxxxxxx>
---
default-configs/devices/arm-softmmu.mak | 2 --
hw/arm/Kconfig | 4 ++++
target/arm/Kconfig | 4 ++++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/default-configs/devices/arm-softmmu.mak b/default-configs/devices/arm-softmmu.mak
index 0824e9be795..6ae964c14fd 100644
--- a/default-configs/devices/arm-softmmu.mak
+++ b/default-configs/devices/arm-softmmu.mak
@@ -14,8 +14,6 @@ CONFIG_INTEGRATOR=y
CONFIG_FSL_IMX31=y
CONFIG_MUSICPAL=y
CONFIG_MUSCA=y
-CONFIG_CHEETAH=y
-CONFIG_SX1=y
CONFIG_NSERIES=y
CONFIG_STELLARIS=y
CONFIG_REALVIEW=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index f3ecb73a3d8..f2957b33bee 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -31,6 +31,8 @@ config ARM_VIRT
config CHEETAH
bool
+ default y if TCG && ARM
+ select ARM_V4
select OMAP
select TSC210X
@@ -249,6 +251,8 @@ config COLLIE
config SX1
bool
+ default y if TCG && ARM
+ select ARM_V4
select OMAP
config VERSATILE
diff --git a/target/arm/Kconfig b/target/arm/Kconfig
index ae89d05c7e5..811e1e81652 100644
--- a/target/arm/Kconfig
+++ b/target/arm/Kconfig
@@ -6,6 +6,10 @@ config AARCH64
bool
select ARM
+config ARM_V4
+ bool
+ depends on TCG && ARM
+
config ARM_V7M
bool
select PTIMER
--
2.26.2
