system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-10-14 15:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm/Kconfig: Do not build TCG-only boards on a KVM-only build

Browse source 
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 <farosas@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230426180013.14814-12-farosas@suse.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Fabiano Rosas 2023-04-26 15:00:11 -03:00 committed by Peter Maydell
parent 99f2f2ad9e
commit 29d9efca16
3 changed files with 41 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configs/devices/aarch64-softmmu/default.mak
View file

@ -2,7 +2,3 @@
# We support all the 32 bit boards so need all their config # We support all the 32 bit boards so need all their config
include ../arm-softmmu/default.mak include ../arm-softmmu/default.mak
CONFIG_XLNX_ZYNQMP_ARM=y
CONFIG_XLNX_VERSAL=y
CONFIG_SBSA_REF=y

37
configs/devices/arm-softmmu/default.mak
View file

@ -4,40 +4,3 @@
# CONFIG_TEST_DEVICES=n # CONFIG_TEST_DEVICES=n
CONFIG_ARM_VIRT=y 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_OLIMEX_STM32_H405=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

42
hw/arm/Kconfig
View file

@ -35,20 +35,24 @@ config ARM_VIRT
config CHEETAH config CHEETAH
bool bool
default y if TCG && ARM
select OMAP select OMAP
select TSC210X select TSC210X
config CUBIEBOARD config CUBIEBOARD
bool bool
default y if TCG && ARM
select ALLWINNER_A10 select ALLWINNER_A10
config DIGIC config DIGIC
bool bool
default y if TCG && ARM
select PTIMER select PTIMER
select PFLASH_CFI02 select PFLASH_CFI02
config EXYNOS4 config EXYNOS4
bool bool
default y if TCG && ARM
imply I2C_DEVICES imply I2C_DEVICES
select A9MPCORE select A9MPCORE
select I2C select I2C
@ -61,6 +65,7 @@ config EXYNOS4
config HIGHBANK config HIGHBANK
bool bool
default y if TCG && ARM
select A9MPCORE select A9MPCORE
select A15MPCORE select A15MPCORE
select AHCI select AHCI
@ -75,6 +80,7 @@ config HIGHBANK
config INTEGRATOR config INTEGRATOR
bool bool
default y if TCG && ARM
select ARM_TIMER select ARM_TIMER
select INTEGRATOR_DEBUG select INTEGRATOR_DEBUG
select PL011 # UART select PL011 # UART
@ -87,12 +93,14 @@ config INTEGRATOR
config MAINSTONE config MAINSTONE
bool bool
default y if TCG && ARM
select PXA2XX select PXA2XX
select PFLASH_CFI01 select PFLASH_CFI01
select SMC91C111 select SMC91C111
config MUSCA config MUSCA
bool bool
default y if TCG && ARM
select ARMSSE select ARMSSE
select PL011 select PL011
select PL031 select PL031
@ -104,6 +112,7 @@ config MARVELL_88W8618
config MUSICPAL config MUSICPAL
bool bool
default y if TCG && ARM
select OR_IRQ select OR_IRQ
select BITBANG_I2C select BITBANG_I2C
select MARVELL_88W8618 select MARVELL_88W8618
@ -114,18 +123,22 @@ config MUSICPAL
config NETDUINO2 config NETDUINO2
bool bool
default y if TCG && ARM
select STM32F205_SOC select STM32F205_SOC
config NETDUINOPLUS2 config NETDUINOPLUS2
bool bool
default y if TCG && ARM
select STM32F405_SOC select STM32F405_SOC
config OLIMEX_STM32_H405 config OLIMEX_STM32_H405
bool bool
default y if TCG && ARM
select STM32F405_SOC select STM32F405_SOC
config NSERIES config NSERIES
bool bool
default y if TCG && ARM
select OMAP select OMAP
select TMP105 # temperature sensor select TMP105 # temperature sensor
select BLIZZARD # LCD/TV controller select BLIZZARD # LCD/TV controller
@ -158,12 +171,14 @@ config PXA2XX
config GUMSTIX config GUMSTIX
bool bool
default y if TCG && ARM
select PFLASH_CFI01 select PFLASH_CFI01
select SMC91C111 select SMC91C111
select PXA2XX select PXA2XX
config TOSA config TOSA
bool bool
default y if TCG && ARM
select ZAURUS # scoop select ZAURUS # scoop
select MICRODRIVE select MICRODRIVE
select PXA2XX select PXA2XX
@ -171,6 +186,7 @@ config TOSA
config SPITZ config SPITZ
bool bool
default y if TCG && ARM
select ADS7846 # touch-screen controller select ADS7846 # touch-screen controller
select MAX111X # A/D converter select MAX111X # A/D converter
select WM8750 # audio codec select WM8750 # audio codec
@ -183,6 +199,7 @@ config SPITZ
config Z2 config Z2
bool bool
default y if TCG && ARM
select PFLASH_CFI01 select PFLASH_CFI01
select WM8750 select WM8750
select PL011 # UART select PL011 # UART
@ -190,6 +207,7 @@ config Z2
config REALVIEW config REALVIEW
bool bool
default y if TCG && ARM
imply PCI_DEVICES imply PCI_DEVICES
imply PCI_TESTDEV imply PCI_TESTDEV
imply I2C_DEVICES imply I2C_DEVICES
@ -218,6 +236,7 @@ config REALVIEW
config SBSA_REF config SBSA_REF
bool bool
default y if TCG && AARCH64
imply PCI_DEVICES imply PCI_DEVICES
select AHCI select AHCI
select ARM_SMMUV3 select ARM_SMMUV3
@ -233,11 +252,13 @@ config SBSA_REF
config SABRELITE config SABRELITE
bool bool
default y if TCG && ARM
select FSL_IMX6 select FSL_IMX6
select SSI_M25P80 select SSI_M25P80
config STELLARIS config STELLARIS
bool bool
default y if TCG && ARM
imply I2C_DEVICES imply I2C_DEVICES
select ARM_V7M select ARM_V7M
select CMSDK_APB_WATCHDOG select CMSDK_APB_WATCHDOG
@ -255,6 +276,7 @@ config STELLARIS
config STM32VLDISCOVERY config STM32VLDISCOVERY
bool bool
default y if TCG && ARM
select STM32F100_SOC select STM32F100_SOC
config STRONGARM config STRONGARM
@ -263,16 +285,19 @@ config STRONGARM
config COLLIE config COLLIE
bool bool
default y if TCG && ARM
select PFLASH_CFI01 select PFLASH_CFI01
select ZAURUS # scoop select ZAURUS # scoop
select STRONGARM select STRONGARM
config SX1 config SX1
bool bool
default y if TCG && ARM
select OMAP select OMAP
config VERSATILE config VERSATILE
bool bool
default y if TCG && ARM
select ARM_TIMER # sp804 select ARM_TIMER # sp804
select PFLASH_CFI01 select PFLASH_CFI01
select LSI_SCSI_PCI select LSI_SCSI_PCI
@ -284,6 +309,7 @@ config VERSATILE
config VEXPRESS config VEXPRESS
bool bool
default y if TCG && ARM
select A9MPCORE select A9MPCORE
select A15MPCORE select A15MPCORE
select ARM_MPTIMER select ARM_MPTIMER
@ -299,6 +325,7 @@ config VEXPRESS
config ZYNQ config ZYNQ
bool bool
default y if TCG && ARM
select A9MPCORE select A9MPCORE
select CADENCE # UART select CADENCE # UART
select PFLASH_CFI02 select PFLASH_CFI02
@ -315,7 +342,7 @@ config ZYNQ
config ARM_V7M config ARM_V7M
bool bool
# currently v7M must be included in a TCG build due to translate.c # currently v7M must be included in a TCG build due to translate.c
default y if TCG && (ARM || AARCH64) default y if TCG && ARM
select PTIMER select PTIMER
config ALLWINNER_A10 config ALLWINNER_A10
@ -334,6 +361,7 @@ config ALLWINNER_A10
config ALLWINNER_H3 config ALLWINNER_H3
bool bool
default y if TCG && ARM
select ALLWINNER_A10_PIT select ALLWINNER_A10_PIT
select ALLWINNER_SUN8I_EMAC select ALLWINNER_SUN8I_EMAC
select ALLWINNER_I2C select ALLWINNER_I2C
@ -348,6 +376,7 @@ config ALLWINNER_H3
config RASPI config RASPI
bool bool
default y if TCG && ARM
select FRAMEBUFFER select FRAMEBUFFER
select PL011 # UART select PL011 # UART
select SDHCI select SDHCI
@ -378,6 +407,7 @@ config STM32F405_SOC
config XLNX_ZYNQMP_ARM config XLNX_ZYNQMP_ARM
bool bool
default y if TCG && AARCH64
select AHCI select AHCI
select ARM_GIC select ARM_GIC
select CADENCE select CADENCE
@ -395,6 +425,7 @@ config XLNX_ZYNQMP_ARM
config XLNX_VERSAL config XLNX_VERSAL
bool bool
default y if TCG && AARCH64
select ARM_GIC select ARM_GIC
select PL011 select PL011
select CADENCE select CADENCE
@ -408,6 +439,7 @@ config XLNX_VERSAL
config NPCM7XX config NPCM7XX
bool bool
default y if TCG && ARM
select A9MPCORE select A9MPCORE
select ADM1272 select ADM1272
select ARM_GIC select ARM_GIC
@ -424,6 +456,7 @@ config NPCM7XX
config FSL_IMX25 config FSL_IMX25
bool bool
default y if TCG && ARM
imply I2C_DEVICES imply I2C_DEVICES
select IMX select IMX
select IMX_FEC select IMX_FEC
@ -433,6 +466,7 @@ config FSL_IMX25
config FSL_IMX31 config FSL_IMX31
bool bool
default y if TCG && ARM
imply I2C_DEVICES imply I2C_DEVICES
select SERIAL select SERIAL
select IMX select IMX
@ -453,6 +487,7 @@ config FSL_IMX6
config ASPEED_SOC config ASPEED_SOC
bool bool
default y if TCG && ARM
select DS1338 select DS1338
select FTGMAC100 select FTGMAC100
select I2C select I2C
@ -473,6 +508,7 @@ config ASPEED_SOC
config MPS2 config MPS2
bool bool
default y if TCG && ARM
imply I2C_DEVICES imply I2C_DEVICES
select ARMSSE select ARMSSE
select LAN9118 select LAN9118
@ -488,6 +524,7 @@ config MPS2
config FSL_IMX7 config FSL_IMX7
bool bool
default y if TCG && ARM
imply PCI_DEVICES imply PCI_DEVICES
imply TEST_DEVICES imply TEST_DEVICES
imply I2C_DEVICES imply I2C_DEVICES
@ -506,6 +543,7 @@ config ARM_SMMUV3
config FSL_IMX6UL config FSL_IMX6UL
bool bool
default y if TCG && ARM
imply I2C_DEVICES imply I2C_DEVICES
select A15MPCORE select A15MPCORE
select IMX select IMX
@ -517,6 +555,7 @@ config FSL_IMX6UL
config MICROBIT config MICROBIT
bool bool
default y if TCG && ARM
select NRF51_SOC select NRF51_SOC
config NRF51_SOC config NRF51_SOC
@ -528,6 +567,7 @@ config NRF51_SOC
config EMCRAFT_SF2 config EMCRAFT_SF2
bool bool
default y if TCG && ARM
select MSF2 select MSF2
select SSI_M25P80 select SSI_M25P80