Machines can be automatically selected using the Kconfig
'default y' syntax. This change allow deselecting these
machines without having to modify default-configs/ files.
Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
---
default-configs/devices/aarch64-softmmu.mak | 3 ---
default-configs/devices/arm-softmmu.mak | 2 --
hw/arm/Kconfig | 4 ++++
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/default-configs/devices/aarch64-softmmu.mak
b/default-configs/devices/aarch64-softmmu.mak
index a4202f56817..a94c7786919 100644
--- a/default-configs/devices/aarch64-softmmu.mak
+++ b/default-configs/devices/aarch64-softmmu.mak
@@ -2,6 +2,3 @@
# We support all the 32 bit boards so need all their config
include arm-softmmu.mak
-
-CONFIG_XLNX_VERSAL=y
-CONFIG_SBSA_REF=y
diff --git a/default-configs/devices/arm-softmmu.mak
b/default-configs/devices/arm-softmmu.mak
index 0fc80d7d6df..7d55c156bab 100644
--- a/default-configs/devices/arm-softmmu.mak
+++ b/default-configs/devices/arm-softmmu.mak
@@ -3,14 +3,12 @@
# CONFIG_PCI_DEVICES=n
# CONFIG_TEST_DEVICES=n
-CONFIG_ARM_VIRT=y
CONFIG_CUBIEBOARD=y
CONFIG_EXYNOS4=y
CONFIG_REALVIEW=y
CONFIG_VEXPRESS=y
CONFIG_ZYNQ=y
CONFIG_NPCM7XX=y
-CONFIG_RASPI=y
CONFIG_SABRELITE=y
CONFIG_FSL_IMX7=y
CONFIG_FSL_IMX6UL=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 768830cc28c..043710be3df 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -1,5 +1,6 @@
config ARM_VIRT
bool
+ default y if ARM
imply PCI_DEVICES
imply TEST_DEVICES
imply VFIO_AMD_XGBE
@@ -224,6 +225,7 @@ config REALVIEW
config SBSA_REF
bool
+ default y if AARCH64
imply PCI_DEVICES
select AHCI
select ARM_SMMUV3
@@ -341,6 +343,7 @@ config ALLWINNER_H3
config RASPI
bool
+ default y if ARM
select FRAMEBUFFER
select PL011 # UART
select SDHCI
@@ -382,6 +385,7 @@ config XLNX_ZYNQMP_ARM
config XLNX_VERSAL
bool
+ default y if AARCH64
select ARM_GIC
select PL011
select CADENCE
--
2.26.2
