ptimer: express dependencies with Kconfig

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20190123065618.3520-39-yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 8ced4e89942b9ce3678e7a8b37bedf410f54b63f..b7b05421e4bee54f84a0deff0b3d8b1cfebf69bf 100644 (file)
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -6,7 +6,6 @@ CONFIG_VGA=y
 CONFIG_NAND=y
 CONFIG_ECC=y
 CONFIG_SERIAL=y
-CONFIG_PTIMER=y
 CONFIG_SD=y
 CONFIG_MAX7310=y
 CONFIG_WM8750=y

diff --git a/default-configs/cris-softmmu.mak b/default-configs/cris-softmmu.mak
index a637c4b4bf73bc7b2f8186a7fe9bbe2670fc925c..b3cae5966bb3c3c3e9eca13ad085c1253cc98f8e 100644 (file)
--- a/default-configs/cris-softmmu.mak
+++ b/default-configs/cris-softmmu.mak
@@ -2,6 +2,5 @@
 
 CONFIG_ETRAXFS=y
 CONFIG_NAND=y
-CONFIG_PTIMER=y
 CONFIG_PFLASH_CFI02=y
 CONFIG_AXIS=y

diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak
index ef0f4bae72d1776718ad7f522dbab5a37c448327..f4898383ebc72a2680e2d4f72d31490f4901672e 100644 (file)
--- a/default-configs/lm32-softmmu.mak
+++ b/default-configs/lm32-softmmu.mak
@@ -3,7 +3,6 @@
 CONFIG_LM32=y
 CONFIG_MILKYMIST=y
 CONFIG_FRAMEBUFFER=y
-CONFIG_PTIMER=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_PFLASH_CFI02=y
 CONFIG_SD=y

diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index 27f5274244ae9771a5b36d93fd8d94a252a5aa2a..a12eeced49e71c583955a03c10a7d5fe89cdb6ac 100644 (file)
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -1,6 +1,5 @@
 # Default configuration for m68k-softmmu
 
 CONFIG_COLDFIRE=y
-CONFIG_PTIMER=y
 CONFIG_AN5206=y
 CONFIG_MCF5208=y

diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak
index 14837cf74ac0f7fe7fe8d1d55b3ac7ebd892f317..a4a67705ba4e7815dd00aab3dc0599653ca2ab35 100644 (file)
--- a/default-configs/microblaze-softmmu.mak
+++ b/default-configs/microblaze-softmmu.mak
@@ -1,6 +1,5 @@
 # Default configuration for microblaze-softmmu
 
-CONFIG_PTIMER=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_SERIAL=y
 CONFIG_XILINX=y

diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-softmmu.mak
index ab42d0fc280862fec288fd153f6a9d43eaf86a3a..b3c507e37b6c73c3d7b5b8f6897f94440174cd04 100644 (file)
--- a/default-configs/nios2-softmmu.mak
+++ b/default-configs/nios2-softmmu.mak
@@ -2,6 +2,5 @@
 
 CONFIG_NIOS2=y
 CONFIG_SERIAL=y
-CONFIG_PTIMER=y
 CONFIG_ALTERA_TIMER=y
 CONFIG_NIOS2_10M50=y

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 0e46d6ab2f4b71bd4137ac00d673dc4ceb037d5b..0dcd863e80557f2fe7903f6b87b8445c7d41af04 100644 (file)
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -14,7 +14,6 @@ CONFIG_OPENPIC=y
 CONFIG_PPCE500_PCI=y
 CONFIG_PFLASH_CFI01=y
 CONFIG_PFLASH_CFI02=y
-CONFIG_PTIMER=y
 CONFIG_I8259=y
 CONFIG_XILINX=y
 CONFIG_XILINX_ETHLITE=y

diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 8b003e11146a9734b42295ab8197d1aba31c6cd9..7172c8bdc9ad1af595f49719c09ddeba49335248 100644 (file)
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -4,7 +4,6 @@ CONFIG_PCI=y
 CONFIG_PCI_DEVICES=y
 CONFIG_SERIAL=y
 CONFIG_SERIAL_ISA=y
-CONFIG_PTIMER=y
 CONFIG_PFLASH_CFI02=y
 CONFIG_SH4=y
 CONFIG_IDE_MMIO=y

diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index 6f58242974ecf1dc088ec48a347396fffa562300..3622afc650da05e6f3df51f91d553d58bbbf84f8 100644 (file)
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -4,7 +4,6 @@ CONFIG_PCI=y
 CONFIG_PCI_DEVICES=y
 CONFIG_SERIAL=y
 CONFIG_SERIAL_ISA=y
-CONFIG_PTIMER=y
 CONFIG_PFLASH_CFI02=y
 CONFIG_SH4=y
 CONFIG_IDE_MMIO=y

diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak
index 805c4007ed097224b5d4babb0b33a199d5fa60b2..b31a9f2d443811d4414d7d5444dfb477ab426233 100644 (file)
--- a/default-configs/sparc-softmmu.mak
+++ b/default-configs/sparc-softmmu.mak
@@ -5,7 +5,6 @@ CONFIG_ECC=y
 CONFIG_ESP=y
 CONFIG_ESCC=y
 CONFIG_M48T59=y
-CONFIG_PTIMER=y
 CONFIG_FDC=y
 CONFIG_EMPTY_SLOT=y
 CONFIG_PCNET_COMMON=y

diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index 2d23b0c7c2fcb0f3ed52f47e2ab353674de68eb0..528af8f3852813e0f7be1361610cbf78a084e50e 100644 (file)
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -3,7 +3,6 @@
 CONFIG_PCI=y
 CONFIG_PCI_DEVICES=y
 CONFIG_M48T59=y
-CONFIG_PTIMER=y
 CONFIG_SERIAL=y
 CONFIG_SERIAL_ISA=y
 CONFIG_PARALLEL=y

diff --git a/default-configs/unicore32-softmmu.mak b/default-configs/unicore32-softmmu.mak
index 5f6c4a80471564f12a770effbad57c8ed58770ac..17a7915549135b84e844ba1a6678963996161393 100644 (file)
--- a/default-configs/unicore32-softmmu.mak
+++ b/default-configs/unicore32-softmmu.mak
@@ -1,5 +1,4 @@
 # Default configuration for unicore32-softmmu
 CONFIG_ISA_BUS=y
 CONFIG_PUV3=y
-CONFIG_PTIMER=y
 CONFIG_PCKBD=y

diff --git a/hw/Kconfig b/hw/Kconfig
index f902c8fdc680ddef6f2e83b77c62dbac22f0e7e1..d5ecd02070138d7f97cb99fe780bbcf4bf43557e 100644 (file)
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -66,6 +66,8 @@ config TEST_DEVICES
 
 config XILINX
     bool
+    select PTIMER # for hw/timer/xilinx_timer.c
 
 config XILINX_AXI
     bool
+    select PTIMER # for hw/dma/xilinx_axidma.c

diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 9eab67bddde9b0566e1b33afe32560c2d314c1f4..d298fbdc89e56a233d89e5de78eeb083d8cb9f58 100644 (file)
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -4,9 +4,11 @@ config ARM_VIRT
 
 config DIGIC
     bool
+    select PTIMER
 
 config EXYNOS4
     bool
+    select PTIMER
 
 config HIGHBANK
     bool
@@ -19,6 +21,7 @@ config MAINSTONE
 
 config MUSICPAL
     bool
+    select PTIMER
 
 config NETDUINO2
     bool
@@ -94,6 +97,7 @@ config NRF51_SOC
 
 config MSF2
     bool
+    select PTIMER
 
 config ZAURUS
     bool

diff --git a/hw/cris/Kconfig b/hw/cris/Kconfig
index 86954ab0b76a879f538ed7c11cb65ec158b140fc..b7738ab2eb1b41e15d3c3793af3066c5a48d1799 100644 (file)
--- a/hw/cris/Kconfig
+++ b/hw/cris/Kconfig
@@ -3,3 +3,4 @@ config AXIS
 
 config ETRAXFS
    bool
+   select PTIMER

diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig
index 84c530e991442810cf2e40ade3ae0544032d4483..4f45840670e4917728921b704fb1a1aa4a5b0425 100644 (file)
--- a/hw/lm32/Kconfig
+++ b/hw/lm32/Kconfig
@@ -1,5 +1,7 @@
 config LM32
     bool
+    select PTIMER
 
 config MILKYMIST
     bool
+    select PTIMER

diff --git a/hw/m68k/Kconfig b/hw/m68k/Kconfig
index cd66ada9094195ff57e8715b176cefa1bcec88d8..8e91edaf0372452369b4cfb339efce3b59cac484 100644 (file)
--- a/hw/m68k/Kconfig
+++ b/hw/m68k/Kconfig
@@ -3,6 +3,8 @@ config AN5206
 
 config MCF5206
     bool
+    select PTIMER
 
 config MCF5208
     bool
+    select PTIMER

diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
index 348c9bf6d3429899120c6192f9c2531164d034cb..cdc07e59b67bd3e0e28d2e0bdfa2553ec594c6c0 100644 (file)
--- a/hw/mips/Kconfig
+++ b/hw/mips/Kconfig
@@ -15,6 +15,7 @@ config FULONG
 
 config MIPS_CPS
     bool
+    select PTIMER
 
 config MIPS_BOSTON
     bool

diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 5f63701134776217b0df132d6f410d4e099a8128..2433d1b4e458059a7996f57bee17a56c60cc588f 100644 (file)
--- a/hw/misc/Kconfig
+++ b/hw/misc/Kconfig
@@ -68,6 +68,7 @@ config ECCMEMCTL
 
 config IMX
     bool
+    select PTIMER
 
 config STM32F2XX_SYSCFG
     bool

diff --git a/hw/net/Kconfig b/hw/net/Kconfig
index a309831e6e4d973f182121e027585eea5cd53f9e..86b880ba335ae1fa1ea8e0d6d0e0a91bfcebf71c 100644 (file)
--- a/hw/net/Kconfig
+++ b/hw/net/Kconfig
@@ -45,6 +45,7 @@ config SMC91C111
 
 config LAN9118
     bool
+    select PTIMER
 
 config NE2000_ISA
     bool
@@ -97,6 +98,7 @@ config VIRTIO_NET
 
 config ETSEC
     bool
+    select PTIMER
 
 config ROCKER
     bool

diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig
index 417a72fd5ddfbfd4127f279b7636161ddfc2f132..1ea2bc356dbde4e325b22e519e611340b7ae30e0 100644 (file)
--- a/hw/sh4/Kconfig
+++ b/hw/sh4/Kconfig
@@ -9,3 +9,4 @@ config SH7750
 
 config SH4
     bool
+    select PTIMER

diff --git a/hw/sparc/Kconfig b/hw/sparc/Kconfig
index 3795754eb641bf4b96a7cb7ec0c49cdb3b098e6c..c9c214230475f5690276beae78a6f5e6223616ea 100644 (file)
--- a/hw/sparc/Kconfig
+++ b/hw/sparc/Kconfig
@@ -6,6 +6,8 @@ config LEON3
 
 config GRLIB
     bool
+    select PTIMER
 
 config SLAVIO
     bool
+    select PTIMER

diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index e1a6e7469b89a245000f00955932f9c1d2bbcba5..a021c742de630d399c0f96bd11d62a28a4860000 100644 (file)
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -1,8 +1,10 @@
 config ARM_TIMER
     bool
+    select PTIMER
 
 config ARM_MPTIMER
     bool
+    select PTIMER
 
 config A9_GTIMER
     bool
@@ -36,12 +38,14 @@ config XLNX_ZYNQMP
 
 config ALTERA_TIMER
     bool
+    select PTIMER
 
 config MC146818RTC
     bool
 
 config ALLWINNER_A10_PIT
     bool
+    select PTIMER
 
 config STM32F2XX_TIMER
     bool
@@ -51,6 +55,8 @@ config SUN4V_RTC
 
 config CMSDK_APB_TIMER
     bool
+    select PTIMER
 
 config CMSDK_APB_DUALTIMER
     bool
+    select PTIMER

diff --git a/hw/unicore32/Kconfig b/hw/unicore32/Kconfig
index b3cf294c04adf76376adbca8e58468e7c81da790..a03a9965c2b379f416f9999b07f5944a486146e7 100644 (file)
--- a/hw/unicore32/Kconfig
+++ b/hw/unicore32/Kconfig
@@ -1,2 +1,3 @@
 config PUV3
     bool
+    select PTIMER

diff --git a/hw/watchdog/Kconfig b/hw/watchdog/Kconfig
index 35ccb729bf05a2ecf2fbcf67323a923b5869b4cf..2118d897c93d0af87644e65f43ab8362d456cf2d 100644 (file)
--- a/hw/watchdog/Kconfig
+++ b/hw/watchdog/Kconfig
@@ -1,5 +1,6 @@
 config CMSDK_APB_WATCHDOG
     bool
+    select PTIMER
 
 config WDT_IB6300ESB
     bool