From 9533dcdd416530a0d72140c122bf90517b6c81eb Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 23 Jan 2019 14:56:12 +0800 Subject: [PATCH] ptimer: express dependencies with Kconfig Signed-off-by: Paolo Bonzini Signed-off-by: Yang Zhong Reviewed-by: Thomas Huth Message-Id: <20190123065618.3520-39-yang.zhong@intel.com> Signed-off-by: Paolo Bonzini --- default-configs/arm-softmmu.mak | 1 - default-configs/cris-softmmu.mak | 1 - default-configs/lm32-softmmu.mak | 1 - default-configs/m68k-softmmu.mak | 1 - default-configs/microblaze-softmmu.mak | 1 - default-configs/nios2-softmmu.mak | 1 - default-configs/ppc-softmmu.mak | 1 - default-configs/sh4-softmmu.mak | 1 - default-configs/sh4eb-softmmu.mak | 1 - default-configs/sparc-softmmu.mak | 1 - default-configs/sparc64-softmmu.mak | 1 - default-configs/unicore32-softmmu.mak | 1 - hw/Kconfig | 2 ++ hw/arm/Kconfig | 4 ++++ hw/cris/Kconfig | 1 + hw/lm32/Kconfig | 2 ++ hw/m68k/Kconfig | 2 ++ hw/mips/Kconfig | 1 + hw/misc/Kconfig | 1 + hw/net/Kconfig | 2 ++ hw/sh4/Kconfig | 1 + hw/sparc/Kconfig | 2 ++ hw/timer/Kconfig | 6 ++++++ hw/unicore32/Kconfig | 1 + hw/watchdog/Kconfig | 1 + 25 files changed, 26 insertions(+), 12 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 8ced4e8994..b7b05421e4 100644 --- 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 a637c4b4bf..b3cae5966b 100644 --- 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 ef0f4bae72..f4898383eb 100644 --- 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 27f5274244..a12eeced49 100644 --- 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 14837cf74a..a4a67705ba 100644 --- 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 ab42d0fc28..b3c507e37b 100644 --- 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 0e46d6ab2f..0dcd863e80 100644 --- 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 8b003e1114..7172c8bdc9 100644 --- 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 6f58242974..3622afc650 100644 --- 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 805c4007ed..b31a9f2d44 100644 --- 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 2d23b0c7c2..528af8f385 100644 --- 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 5f6c4a8047..17a7915549 100644 --- 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 f902c8fdc6..d5ecd02070 100644 --- 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 9eab67bddd..d298fbdc89 100644 --- 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 86954ab0b7..b7738ab2eb 100644 --- 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 84c530e991..4f45840670 100644 --- 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 cd66ada909..8e91edaf03 100644 --- 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 348c9bf6d3..cdc07e59b6 100644 --- 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 5f63701134..2433d1b4e4 100644 --- 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 a309831e6e..86b880ba33 100644 --- 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 417a72fd5d..1ea2bc356d 100644 --- 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 3795754eb6..c9c2142304 100644 --- 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 e1a6e7469b..a021c742de 100644 --- 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 b3cf294c04..a03a9965c2 100644 --- 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 35ccb729bf..2118d897c9 100644 --- a/hw/watchdog/Kconfig +++ b/hw/watchdog/Kconfig @@ -1,5 +1,6 @@ config CMSDK_APB_WATCHDOG bool + select PTIMER config WDT_IB6300ESB bool