[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/14] hw/timer: Introduce SH_TIMER Kconfig entry
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 10/14] hw/timer: Introduce SH_TIMER Kconfig entry |
Date: |
Sat, 6 Mar 2021 16:36:17 +0100 |
We want to be able to use the 'SH4' config for architecture
specific features. Add more fine-grained selection by adding
a CONFIG_SH_TIMER selector for the SH4 timer control unit.
Add the missing MAINTAINERS entries.
Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210222141514.2646278-6-f4bug@amsat.org>
---
MAINTAINERS | 2 ++
hw/sh4/Kconfig | 2 +-
hw/timer/Kconfig | 4 ++++
hw/timer/meson.build | 2 +-
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 8405741e910..4a722c44b1b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1400,6 +1400,7 @@ S: Odd Fixes
F: hw/char/sh_serial.c
F: hw/sh4/r2d.c
F: hw/intc/sh_intc.c
+F: hw/timer/sh_timer.c
F: include/hw/sh4/sh_intc.h
Shix
@@ -1409,6 +1410,7 @@ S: Odd Fixes
F: hw/char/sh_serial.c
F: hw/sh4/shix.c
F: hw/intc/sh_intc.c
+F: hw/timer/sh_timer.c
F: include/hw/sh4/sh_intc.h
SPARC Machines
diff --git a/hw/sh4/Kconfig b/hw/sh4/Kconfig
index 47240aa97b7..e569470a614 100644
--- a/hw/sh4/Kconfig
+++ b/hw/sh4/Kconfig
@@ -21,7 +21,7 @@ config SH7750
bool
select SH_INTC
select SH_SCI
+ select SH_TIMER
config SH4
bool
- select PTIMER
diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index 8749edfb6a5..18936ef55bf 100644
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -36,6 +36,10 @@ config CMSDK_APB_DUALTIMER
bool
select PTIMER
+config SH_TIMER
+ bool
+ select PTIMER
+
config RENESAS_TMR
bool
diff --git a/hw/timer/meson.build b/hw/timer/meson.build
index be343f68fed..26c2701fd78 100644
--- a/hw/timer/meson.build
+++ b/hw/timer/meson.build
@@ -30,7 +30,7 @@
softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_ost.c'))
softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_timer.c'))
softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_systmr.c'))
-softmmu_ss.add(when: 'CONFIG_SH4', if_true: files('sh_timer.c'))
+softmmu_ss.add(when: 'CONFIG_SH_TIMER', if_true: files('sh_timer.c'))
softmmu_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c'))
softmmu_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true:
files('stm32f2xx_timer.c'))
softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c'))
--
2.26.2
- [PULL 00/14] Renesas patches for 2021-03-06, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 01/14] target/sh4: Fix code style for checkpatch.pl, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 02/14] target/sh4: Replace magic value by MMUAccessType definitions, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 03/14] target/sh4: Remove unused 'int access_type' argument, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 04/14] target/sh4: Let get_physical_address() use MMUAccessType access_type, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 05/14] target/sh4: Remove unused definitions, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 06/14] hw/sh4: Add missing license, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 07/14] hw/sh4: Add missing Kconfig dependency on SH7750 for the R2D board, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 08/14] hw/intc: Introduce SH_INTC Kconfig entry, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 09/14] hw/char: Introduce SH_SCI Kconfig entry, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 10/14] hw/timer: Introduce SH_TIMER Kconfig entry,
Philippe Mathieu-Daudé <=
- [PULL 11/14] hw/block: Introduce TC58128 eeprom Kconfig entry, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 12/14] hw/pci-host: Introduce SH_PCI Kconfig entry, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 13/14] hw/sh4: Remove now unused CONFIG_SH4 from Kconfig, Philippe Mathieu-Daudé, 2021/03/06
- [PULL 14/14] hw/sh4/sh7750_regs: Replace link to license by its full content, Philippe Mathieu-Daudé, 2021/03/06
- Re: [PULL 00/14] Renesas patches for 2021-03-06, Peter Maydell, 2021/03/08