diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2024-09-03 17:07:11 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2024-10-01 14:21:43 +0100 |
| commit | 4dba046c062427d97e6bea007b9a4a0a930d392f (patch) | |
| tree | 9b85fd5b6e831bef96c0f60e99bbde544dac85e7 | |
| parent | 0012b18311cef69c645197f3add108b5e78cd794 (diff) | |
| download | qemu-4dba046c062427d97e6bea007b9a4a0a930d392f.zip qemu-4dba046c062427d97e6bea007b9a4a0a930d392f.tar.gz qemu-4dba046c062427d97e6bea007b9a4a0a930d392f.tar.bz2 | |
hw/arm: Remove STRONGARM->PXA2XX dependency
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 <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20240903160751.4100218-14-peter.maydell@linaro.org
| -rw-r--r-- | hw/arm/Kconfig | 4 | ||||
| -rw-r--r-- | hw/timer/Kconfig | 3 | ||||
| -rw-r--r-- | hw/timer/meson.build | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index c2452bd..8f6cbf9 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -175,6 +175,7 @@ config PXA2XX select SSI select USB_OHCI_SYSBUS select PCMCIA + select PXA2XX_TIMER config REALVIEW bool @@ -261,7 +262,8 @@ config STM32VLDISCOVERY config STRONGARM bool - select PXA2XX + select PXA2XX_TIMER + select SSI config COLLIE bool diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig index 61fbb62..c96fd5d 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 5b6c8b4..c1113eb 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')) |