A KVM-only build won't be able to run A or M-profile cpus,
disable them.
If KVM is not enabled, they are enabled by default.
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
---
Sadly this does not work with --enable-tcg --enable-kvm dual config.
---
default-configs/arm-softmmu.mak | 14 ++++++--------
hw/arm/Kconfig | 16 +++++++++++++---
2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 081d507c87..3995c4bb65 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -1,25 +1,18 @@
# Default configuration for arm-softmmu
-# TODO: ARM_V7M is currently always required - make this more flexible!
-CONFIG_ARM_V7M=y
-
# CONFIG_PCI_DEVICES=n
# CONFIG_TEST_DEVICES=n
+CONFIG_ARM_V7M=n
CONFIG_ARM_VIRT=y
CONFIG_CUBIEBOARD=y
CONFIG_EXYNOS4=y
CONFIG_FSL_IMX31=y
-CONFIG_MUSCA=y
-CONFIG_STELLARIS=y
CONFIG_REALVIEW=y
CONFIG_VEXPRESS=y
CONFIG_ZYNQ=y
-CONFIG_NETDUINO2=y
-CONFIG_MPS2=y
CONFIG_RASPI=y
CONFIG_SABRELITE=y
-CONFIG_EMCRAFT_SF2=y
CONFIG_FSL_IMX7=y
CONFIG_FSL_IMX6UL=y
CONFIG_SEMIHOSTING=y
@@ -38,4 +31,9 @@ CONFIG_SEMIHOSTING=y
#CONFIG_ASPEED_SOC=y
#CONFIG_NSERIES=y
#CONFIG_HIGHBANK=n
+#CONFIG_MUSCA=n
+#CONFIG_STELLARIS=n
+#CONFIG_NETDUINO2=n
+#CONFIG_MPS2=n
+#CONFIG_EMCRAFT_SF2=n
#CONFIG_MICROBIT=n
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 902cceca7e..9b16dfaa5f 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -13,6 +13,18 @@ config ARM_V6
depends on !KVM
bool
+# ARM Microcontroller profile
+config ARM_V7M
+ default y
+ depends on !KVM
+ bool
+
+# ARM Realtime profile
+config ARM_V7R
+ default y
+ depends on !KVM
+ bool
+
config ARM_VIRT
bool
imply PCI_DEVICES
@@ -298,9 +310,6 @@ config ZYNQ
select XILINX_SPIPS
select ZYNQ_DEVCFG
-config ARM_V7M
- bool
-
config ALLWINNER_A10
bool
select AHCI
@@ -328,6 +337,7 @@ config STM32F205_SOC
config XLNX_ZYNQMP_ARM
bool
+ select ARM_V7R
select AHCI
select ARM_GIC
select CADENCE
--
2.20.1
