diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2021-02-21 19:53:35 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2021-03-06 16:18:42 +0100 |
| commit | 25e79527a882eebdbbe8b7408d17f81a29de7d4b (patch) | |
| tree | 451c2c4d6309fb6f058b87499c8904868bdaca07 | |
| parent | 7ae5c8bb6e57b08927a0f9ecae610abda0484ec6 (diff) | |
| download | focaccia-qemu-25e79527a882eebdbbe8b7408d17f81a29de7d4b.tar.gz focaccia-qemu-25e79527a882eebdbbe8b7408d17f81a29de7d4b.zip | |
hw/timer: Introduce SH_TIMER Kconfig entry
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>
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | hw/sh4/Kconfig | 2 | ||||
| -rw-r--r-- | hw/timer/Kconfig | 4 | ||||
| -rw-r--r-- | hw/timer/meson.build | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8405741e91..4a722c44b1 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 47240aa97b..e569470a61 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 8749edfb6a..18936ef55b 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 be343f68fe..26c2701fd7 100644 --- a/hw/timer/meson.build +++ b/hw/timer/meson.build @@ -30,7 +30,7 @@ softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_synctimer.c')) 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')) |