Move all the CONFIG_FOO=y from default.mak into "default y if TCG"
statements in Kconfig. That way they won't be selected when
CONFIG_TCG=n.
I'm leaving CONFIG_ARM_VIRT in default.mak because it allows us to
keep the two default.mak files not empty and keep aarch64-default.mak
including arm-default.mak. That way we don't surprise anyone that's
used to altering these files.
With this change we can start building with --disable-tcg.
Signed-off-by: Fabiano Rosas <faro...@suse.de>
---
sbsa-ref has an explicit check to avoid running with KVM
xlnx-versal-virt has avocado tests tagged with tcg
---
configs/devices/aarch64-softmmu/default.mak | 4 ---
configs/devices/arm-softmmu/default.mak | 36 -------------------
hw/arm/Kconfig | 39 +++++++++++++++++++++
3 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/configs/devices/aarch64-softmmu/default.mak
b/configs/devices/aarch64-softmmu/default.mak
index cf43ac8da1..70e05a197d 100644
--- a/configs/devices/aarch64-softmmu/default.mak
+++ b/configs/devices/aarch64-softmmu/default.mak
@@ -2,7 +2,3 @@
# We support all the 32 bit boards so need all their config
include ../arm-softmmu/default.mak
-
-CONFIG_XLNX_ZYNQMP_ARM=y
-CONFIG_XLNX_VERSAL=y
-CONFIG_SBSA_REF=y
diff --git a/configs/devices/arm-softmmu/default.mak
b/configs/devices/arm-softmmu/default.mak
index 24fb5f0366..647fbce88d 100644
--- a/configs/devices/arm-softmmu/default.mak
+++ b/configs/devices/arm-softmmu/default.mak
@@ -4,39 +4,3 @@
# CONFIG_TEST_DEVICES=n
CONFIG_ARM_VIRT=y
-CONFIG_CUBIEBOARD=y
-CONFIG_EXYNOS4=y
-CONFIG_HIGHBANK=y
-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_STM32VLDISCOVERY=y
-CONFIG_REALVIEW=y
-CONFIG_VERSATILE=y
-CONFIG_VEXPRESS=y
-CONFIG_ZYNQ=y
-CONFIG_MAINSTONE=y
-CONFIG_GUMSTIX=y
-CONFIG_SPITZ=y
-CONFIG_TOSA=y
-CONFIG_Z2=y
-CONFIG_NPCM7XX=y
-CONFIG_COLLIE=y
-CONFIG_ASPEED_SOC=y
-CONFIG_NETDUINO2=y
-CONFIG_NETDUINOPLUS2=y
-CONFIG_MPS2=y
-CONFIG_RASPI=y
-CONFIG_DIGIC=y
-CONFIG_SABRELITE=y
-CONFIG_EMCRAFT_SF2=y
-CONFIG_MICROBIT=y
-CONFIG_FSL_IMX25=y
-CONFIG_FSL_IMX7=y
-CONFIG_FSL_IMX6UL=y
-CONFIG_ALLWINNER_H3=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index e6f984fea8..05b11f53dc 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -34,20 +34,24 @@ config ARM_VIRT
config CHEETAH
bool
+ default y if TCG && (ARM || AARCH64)
select OMAP
select TSC210X
config CUBIEBOARD
bool
+ default y if TCG && (ARM || AARCH64)
select ALLWINNER_A10
config DIGIC
bool
+ default y if TCG && (ARM || AARCH64)
select PTIMER
select PFLASH_CFI02
config EXYNOS4
bool
+ default y if TCG && (ARM || AARCH64)
imply I2C_DEVICES
select A9MPCORE
select I2C
@@ -60,6 +64,7 @@ config EXYNOS4
config HIGHBANK
bool
+ default y if TCG && (ARM || AARCH64)
select A9MPCORE
select A15MPCORE
select AHCI
@@ -74,6 +79,7 @@ config HIGHBANK
config INTEGRATOR
bool
+ default y if TCG && (ARM || AARCH64)
select ARM_TIMER
select INTEGRATOR_DEBUG
select PL011 # UART
@@ -86,12 +92,14 @@ config INTEGRATOR
config MAINSTONE
bool
+ default y if TCG && (ARM || AARCH64)
select PXA2XX
select PFLASH_CFI01
select SMC91C111
config MUSCA
bool
+ default y if TCG && (ARM || AARCH64)
select ARMSSE
select PL011
select PL031
@@ -103,6 +111,7 @@ config MARVELL_88W8618
config MUSICPAL
bool
+ default y if TCG && (ARM || AARCH64)
select OR_IRQ
select BITBANG_I2C
select MARVELL_88W8618
@@ -113,14 +122,17 @@ config MUSICPAL
config NETDUINO2
bool
+ default y if TCG && (ARM || AARCH64)
select STM32F205_SOC
config NETDUINOPLUS2
bool
+ default y if TCG && (ARM || AARCH64)
select STM32F405_SOC
config NSERIES
bool
+ default y if TCG && (ARM || AARCH64)
select OMAP
select TMP105 # tempature sensor
select BLIZZARD # LCD/TV controller
@@ -153,12 +165,14 @@ config PXA2XX
config GUMSTIX
bool
+ default y if TCG && (ARM || AARCH64)
select PFLASH_CFI01
select SMC91C111
select PXA2XX
config TOSA
bool
+ default y if TCG && (ARM || AARCH64)
select ZAURUS # scoop
select MICRODRIVE
select PXA2XX
@@ -166,6 +180,7 @@ config TOSA
config SPITZ
bool
+ default y if TCG && (ARM || AARCH64)
select ADS7846 # touch-screen controller
select MAX111X # A/D converter
select WM8750 # audio codec
@@ -178,6 +193,7 @@ config SPITZ
config Z2
bool
+ default y if TCG && (ARM || AARCH64)
select PFLASH_CFI01
select WM8750
select PL011 # UART
@@ -185,6 +201,7 @@ config Z2
config REALVIEW
bool
+ default y if TCG && (ARM || AARCH64)
imply PCI_DEVICES
imply PCI_TESTDEV
imply I2C_DEVICES
@@ -213,6 +230,7 @@ config REALVIEW
config SBSA_REF
bool
+ default y if TCG && AARCH64
imply PCI_DEVICES
select AHCI
select ARM_SMMUV3
@@ -228,11 +246,13 @@ config SBSA_REF
config SABRELITE
bool
+ default y if TCG && (ARM || AARCH64)
select FSL_IMX6
select SSI_M25P80
config STELLARIS
bool
+ default y if TCG && (ARM || AARCH64)
imply I2C_DEVICES
select ARM_V7M
select CMSDK_APB_WATCHDOG
@@ -250,6 +270,7 @@ config STELLARIS
config STM32VLDISCOVERY
bool
+ default y if TCG && (ARM || AARCH64)
select STM32F100_SOC
config STRONGARM
@@ -258,16 +279,19 @@ config STRONGARM
config COLLIE
bool
+ default y if TCG && (ARM || AARCH64)
select PFLASH_CFI01
select ZAURUS # scoop
select STRONGARM
config SX1
bool
+ default y if TCG && (ARM || AARCH64)
select OMAP
config VERSATILE
bool
+ default y if TCG && (ARM || AARCH64)
select ARM_TIMER # sp804
select PFLASH_CFI01
select LSI_SCSI_PCI
@@ -279,6 +303,7 @@ config VERSATILE
config VEXPRESS
bool
+ default y if TCG && (ARM || AARCH64)
select A9MPCORE
select A15MPCORE
select ARM_MPTIMER
@@ -294,6 +319,7 @@ config VEXPRESS
config ZYNQ
bool
+ default y if TCG && (ARM || AARCH64)
select A9MPCORE
select CADENCE # UART
select PFLASH_CFI02
@@ -324,6 +350,7 @@ config ALLWINNER_A10
config ALLWINNER_H3
bool
+ default y if TCG && (ARM || AARCH64)
select ALLWINNER_A10_PIT
select ALLWINNER_SUN8I_EMAC
select SERIAL
@@ -336,6 +363,7 @@ config ALLWINNER_H3
config RASPI
bool
+ default y if TCG && (ARM || AARCH64)
select FRAMEBUFFER
select PL011 # UART
select SDHCI
@@ -366,6 +394,7 @@ config STM32F405_SOC
config XLNX_ZYNQMP_ARM
bool
+ default y if TCG && AARCH64
select AHCI
select ARM_GIC
select CADENCE
@@ -382,6 +411,7 @@ config XLNX_ZYNQMP_ARM
config XLNX_VERSAL
bool
+ default y if TCG && AARCH64
select ARM_GIC
select PL011
select CADENCE
@@ -395,6 +425,7 @@ config XLNX_VERSAL
config NPCM7XX
bool
+ default y if TCG && (ARM || AARCH64)
select A9MPCORE
select ADM1272
select ARM_GIC
@@ -411,6 +442,7 @@ config NPCM7XX
config FSL_IMX25
bool
+ default y if TCG && (ARM || AARCH64)
imply I2C_DEVICES
select IMX
select IMX_FEC
@@ -420,6 +452,7 @@ config FSL_IMX25
config FSL_IMX31
bool
+ default y if TCG && (ARM || AARCH64)
imply I2C_DEVICES
select SERIAL
select IMX
@@ -440,6 +473,7 @@ config FSL_IMX6
config ASPEED_SOC
bool
+ default y if TCG && (ARM || AARCH64)
select DS1338
select FTGMAC100
select I2C
@@ -460,6 +494,7 @@ config ASPEED_SOC
config MPS2
bool
+ default y if TCG && (ARM || AARCH64)
imply I2C_DEVICES
select ARMSSE
select LAN9118
@@ -475,6 +510,7 @@ config MPS2
config FSL_IMX7
bool
+ default y if TCG && (ARM || AARCH64)
imply PCI_DEVICES
imply TEST_DEVICES
imply I2C_DEVICES
@@ -493,6 +529,7 @@ config ARM_SMMUV3
config FSL_IMX6UL
bool
+ default y if TCG && (ARM || AARCH64)
imply I2C_DEVICES
select A15MPCORE
select IMX
@@ -504,6 +541,7 @@ config FSL_IMX6UL
config MICROBIT
bool
+ default y if TCG && (ARM || AARCH64)
select NRF51_SOC
config NRF51_SOC
@@ -515,6 +553,7 @@ config NRF51_SOC
config EMCRAFT_SF2
bool
+ default y if TCG && (ARM || AARCH64)
select MSF2
select SSI_M25P80
--
2.35.3
