홈 탐색 도움말
가입하기 로그인
FangSoftSoft
/
qemu
의 미러 https://github.com/utmapp/qemu.git
2
0
포크 0
파일 이슈 0 위키
소스 검색

arm/Kconfig: Make TCG dependence explicit

Replace the 'default y if TCG' pattern with 'default y; depends on
TCG'.

That makes explict that there is a dependence on TCG and enabling
these CONFIGs via .mak files without TCG present will fail earlier.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20230523180525.29994-4-farosas@suse.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Fabiano Rosas 2 년 전
부모
da324efb17
커밋
441d701db7
1개의 변경된 파일과 82개의 추가작업 그리고 41개의 파일을 삭제
통합 보기 변경상태 보기
  1. 82 41
      hw/arm/Kconfig

+ 82 - 41
hw/arm/Kconfig
파일 보기 

@@ -35,24 +35,28 @@ config ARM_VIRT
 
 
 
 config CHEETAH
 
 config CHEETAH
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select OMAP
 
     select OMAP
 
     select TSC210X
 
     select TSC210X
 
 
 
 config CUBIEBOARD
 
 config CUBIEBOARD
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select ALLWINNER_A10
 
     select ALLWINNER_A10
 
 
 
 config DIGIC
 
 config DIGIC
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select PTIMER
 
     select PTIMER
 
     select PFLASH_CFI02
 
     select PFLASH_CFI02
 
 
 
 config EXYNOS4
 
 config EXYNOS4
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     imply I2C_DEVICES
 
     imply I2C_DEVICES
 
     select A9MPCORE
 
     select A9MPCORE
 
     select I2C
 
     select I2C
 
@@ -65,7 +69,8 @@ config EXYNOS4
 
 
 
 config HIGHBANK
 
 config HIGHBANK
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select A9MPCORE
 
     select A9MPCORE
 
     select A15MPCORE
 
     select A15MPCORE
 
     select AHCI
 
     select AHCI
 
@@ -80,7 +85,8 @@ config HIGHBANK
 
 
 
 config INTEGRATOR
 
 config INTEGRATOR
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select ARM_TIMER
 
     select ARM_TIMER
 
     select INTEGRATOR_DEBUG
 
     select INTEGRATOR_DEBUG
 
     select PL011 # UART
 
     select PL011 # UART
 
@@ -93,14 +99,16 @@ config INTEGRATOR
 
 
 
 config MAINSTONE
 
 config MAINSTONE
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on 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
 
+    default y
 
+    depends on TCG && ARM
 
     select ARMSSE
 
     select ARMSSE
 
     select PL011
 
     select PL011
 
     select PL031
 
     select PL031
 
@@ -112,7 +120,8 @@ config MARVELL_88W8618
 
 
 
 config MUSICPAL
 
 config MUSICPAL
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select OR_IRQ
 
     select OR_IRQ
 
     select BITBANG_I2C
 
     select BITBANG_I2C
 
     select MARVELL_88W8618
 
     select MARVELL_88W8618
 
@@ -123,22 +132,26 @@ config MUSICPAL
 
 
 
 config NETDUINO2
 
 config NETDUINO2
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select STM32F205_SOC
 
     select STM32F205_SOC
 
 
 
 config NETDUINOPLUS2
 
 config NETDUINOPLUS2
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select STM32F405_SOC
 
     select STM32F405_SOC
 
 
 
 config OLIMEX_STM32_H405
 
 config OLIMEX_STM32_H405
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select STM32F405_SOC
 
     select STM32F405_SOC
 
 
 
 config NSERIES
 
 config NSERIES
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select OMAP
 
     select OMAP
 
     select TMP105   # temperature sensor
 
     select TMP105   # temperature sensor
 
     select BLIZZARD # LCD/TV controller
 
     select BLIZZARD # LCD/TV controller
 
@@ -171,14 +184,16 @@ config PXA2XX
 
 
 
 config GUMSTIX
 
 config GUMSTIX
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on 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
 
+    default y
 
+    depends on TCG && ARM
 
     select ZAURUS  # scoop
 
     select ZAURUS  # scoop
 
     select MICRODRIVE
 
     select MICRODRIVE
 
     select PXA2XX
 
     select PXA2XX
 
@@ -186,7 +201,8 @@ config TOSA
 
 
 
 config SPITZ
 
 config SPITZ
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on 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
 
@@ -199,7 +215,8 @@ config SPITZ
 
 
 
 config Z2
 
 config Z2
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select PFLASH_CFI01
 
     select PFLASH_CFI01
 
     select WM8750
 
     select WM8750
 
     select PL011 # UART
 
     select PL011 # UART
 
@@ -207,7 +224,8 @@ config Z2
 
 
 
 config REALVIEW
 
 config REALVIEW
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     imply PCI_DEVICES
 
     imply PCI_DEVICES
 
     imply PCI_TESTDEV
 
     imply PCI_TESTDEV
 
     imply I2C_DEVICES
 
     imply I2C_DEVICES
 
@@ -236,7 +254,8 @@ config REALVIEW
 
 
 
 config SBSA_REF
 
 config SBSA_REF
 
     bool
 
     bool
 
-    default y if TCG && AARCH64
 
+    default y
 
+    depends on TCG && AARCH64
 
     imply PCI_DEVICES
 
     imply PCI_DEVICES
 
     select AHCI
 
     select AHCI
 
     select ARM_SMMUV3
 
     select ARM_SMMUV3
 
@@ -252,13 +271,15 @@ config SBSA_REF
 
 
 
 config SABRELITE
 
 config SABRELITE
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on 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
 
+    default y
 
+    depends on TCG && ARM
 
     imply I2C_DEVICES
 
     imply I2C_DEVICES
 
     select ARM_V7M
 
     select ARM_V7M
 
     select CMSDK_APB_WATCHDOG
 
     select CMSDK_APB_WATCHDOG
 
@@ -276,7 +297,8 @@ config STELLARIS
 
 
 
 config STM32VLDISCOVERY
 
 config STM32VLDISCOVERY
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select STM32F100_SOC
 
     select STM32F100_SOC
 
 
 
 config STRONGARM
 
 config STRONGARM
 
@@ -285,19 +307,22 @@ config STRONGARM
 
 
 
 config COLLIE
 
 config COLLIE
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on 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
 
+    default y
 
+    depends on TCG && ARM
 
     select OMAP
 
     select OMAP
 
 
 
 config VERSATILE
 
 config VERSATILE
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select ARM_TIMER # sp804
 
     select ARM_TIMER # sp804
 
     select PFLASH_CFI01
 
     select PFLASH_CFI01
 
     select LSI_SCSI_PCI
 
     select LSI_SCSI_PCI
 
@@ -309,7 +334,8 @@ config VERSATILE
 
 
 
 config VEXPRESS
 
 config VEXPRESS
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select A9MPCORE
 
     select A9MPCORE
 
     select A15MPCORE
 
     select A15MPCORE
 
     select ARM_MPTIMER
 
     select ARM_MPTIMER
 
@@ -325,7 +351,8 @@ config VEXPRESS
 
 
 
 config ZYNQ
 
 config ZYNQ
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select A9MPCORE
 
     select A9MPCORE
 
     select CADENCE # UART
 
     select CADENCE # UART
 
     select PFLASH_CFI02
 
     select PFLASH_CFI02
 
@@ -342,7 +369,8 @@ 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
 
+    default y
 
+    depends on TCG && ARM
 
     select PTIMER
 
     select PTIMER
 
 
 
 config ALLWINNER_A10
 
 config ALLWINNER_A10
 
@@ -361,7 +389,8 @@ config ALLWINNER_A10
 
 
 
 config ALLWINNER_H3
 
 config ALLWINNER_H3
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select ALLWINNER_A10_PIT
 
     select ALLWINNER_A10_PIT
 
     select ALLWINNER_SUN8I_EMAC
 
     select ALLWINNER_SUN8I_EMAC
 
     select ALLWINNER_I2C
 
     select ALLWINNER_I2C
 
@@ -376,7 +405,8 @@ config ALLWINNER_H3
 
 
 
 config RASPI
 
 config RASPI
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select FRAMEBUFFER
 
     select FRAMEBUFFER
 
     select PL011 # UART
 
     select PL011 # UART
 
     select SDHCI
 
     select SDHCI
 
@@ -407,7 +437,8 @@ config STM32F405_SOC
 
 
 
 config XLNX_ZYNQMP_ARM
 
 config XLNX_ZYNQMP_ARM
 
     bool
 
     bool
 
-    default y if TCG && AARCH64
 
+    default y
 
+    depends on TCG && AARCH64
 
     select AHCI
 
     select AHCI
 
     select ARM_GIC
 
     select ARM_GIC
 
     select CADENCE
 
     select CADENCE
 
@@ -425,7 +456,8 @@ config XLNX_ZYNQMP_ARM
 
 
 
 config XLNX_VERSAL
 
 config XLNX_VERSAL
 
     bool
 
     bool
 
-    default y if TCG && AARCH64
 
+    default y
 
+    depends on TCG && AARCH64
 
     select ARM_GIC
 
     select ARM_GIC
 
     select PL011
 
     select PL011
 
     select CADENCE
 
     select CADENCE
 
@@ -440,7 +472,8 @@ config XLNX_VERSAL
 
 
 
 config NPCM7XX
 
 config NPCM7XX
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select A9MPCORE
 
     select A9MPCORE
 
     select ADM1272
 
     select ADM1272
 
     select ARM_GIC
 
     select ARM_GIC
 
@@ -457,7 +490,8 @@ config NPCM7XX
 
 
 
 config FSL_IMX25
 
 config FSL_IMX25
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     imply I2C_DEVICES
 
     imply I2C_DEVICES
 
     select IMX
 
     select IMX
 
     select IMX_FEC
 
     select IMX_FEC
 
@@ -467,7 +501,8 @@ config FSL_IMX25
 
 
 
 config FSL_IMX31
 
 config FSL_IMX31
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     imply I2C_DEVICES
 
     imply I2C_DEVICES
 
     select SERIAL
 
     select SERIAL
 
     select IMX
 
     select IMX
 
@@ -488,7 +523,8 @@ config FSL_IMX6
 
 
 
 config ASPEED_SOC
 
 config ASPEED_SOC
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select DS1338
 
     select DS1338
 
     select FTGMAC100
 
     select FTGMAC100
 
     select I2C
 
     select I2C
 
@@ -509,7 +545,8 @@ config ASPEED_SOC
 
 
 
 config MPS2
 
 config MPS2
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     imply I2C_DEVICES
 
     imply I2C_DEVICES
 
     select ARMSSE
 
     select ARMSSE
 
     select LAN9118
 
     select LAN9118
 
@@ -525,7 +562,8 @@ config MPS2
 
 
 
 config FSL_IMX7
 
 config FSL_IMX7
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     imply PCI_DEVICES
 
     imply PCI_DEVICES
 
     imply TEST_DEVICES
 
     imply TEST_DEVICES
 
     imply I2C_DEVICES
 
     imply I2C_DEVICES
 
@@ -544,7 +582,8 @@ config ARM_SMMUV3
 
 
 
 config FSL_IMX6UL
 
 config FSL_IMX6UL
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     imply I2C_DEVICES
 
     imply I2C_DEVICES
 
     select A15MPCORE
 
     select A15MPCORE
 
     select IMX
 
     select IMX
 
@@ -556,7 +595,8 @@ config FSL_IMX6UL
 
 
 
 config MICROBIT
 
 config MICROBIT
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select NRF51_SOC
 
     select NRF51_SOC
 
 
 
 config NRF51_SOC
 
 config NRF51_SOC
 
@@ -568,7 +608,8 @@ config NRF51_SOC
 
 
 
 config EMCRAFT_SF2
 
 config EMCRAFT_SF2
 
     bool
 
     bool
 
-    default y if TCG && ARM
 
+    default y
 
+    depends on TCG && ARM
 
     select MSF2
 
     select MSF2
 
     select SSI_M25P80
 
     select SSI_M25P80