From 4dba046c062427d97e6bea007b9a4a0a930d392f Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 3 Sep 2024 17:07:11 +0100 Subject: hw/arm: Remove STRONGARM->PXA2XX dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently the STRONGARM KConfig symbol pulls in PXA2XX. Since we've now removed all the true uses of PXA2XX, we'd like to remove the PXA2XX symbol too. To permit that, make STRONGARM directly select the things it truly depends on: * pxa25x-timer * SSI Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-id: 20240903160751.4100218-14-peter.maydell@linaro.org --- hw/timer/Kconfig | 3 +++ hw/timer/meson.build | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'hw/timer') diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index 61fbb62b65..c96fd5d97a 100644 --- a/hw/timer/Kconfig +++ b/hw/timer/Kconfig @@ -21,6 +21,9 @@ config ALLWINNER_A10_PIT bool select PTIMER +config PXA2XX_TIMER + bool + config SIFIVE_PWM bool diff --git a/hw/timer/meson.build b/hw/timer/meson.build index 5b6c8b4be9..c1113eb90b 100644 --- a/hw/timer/meson.build +++ b/hw/timer/meson.build @@ -23,7 +23,7 @@ system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_timer.c')) system_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_timer.c')) system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gptimer.c')) system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_synctimer.c')) -system_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_timer.c')) +system_ss.add(when: 'CONFIG_PXA2XX_TIMER', if_true: files('pxa2xx_timer.c')) system_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_systmr.c')) system_ss.add(when: 'CONFIG_SH_TIMER', if_true: files('sh_timer.c')) system_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c')) -- cgit 1.4.1