Browse Source

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
Peter Maydell 11 months ago
parent
commit
4dba046c06
3 changed files with 7 additions and 2 deletions
  1. 3 1
      hw/arm/Kconfig
  2. 3 0
      hw/timer/Kconfig
  3. 1 1
      hw/timer/meson.build

+ 3 - 1
hw/arm/Kconfig

@@ -175,6 +175,7 @@ config PXA2XX
     select SSI
     select SSI
     select USB_OHCI_SYSBUS
     select USB_OHCI_SYSBUS
     select PCMCIA
     select PCMCIA
+    select PXA2XX_TIMER
 
 
 config REALVIEW
 config REALVIEW
     bool
     bool
@@ -261,7 +262,8 @@ config STM32VLDISCOVERY
 
 
 config STRONGARM
 config STRONGARM
     bool
     bool
-    select PXA2XX
+    select PXA2XX_TIMER
+    select SSI
 
 
 config COLLIE
 config COLLIE
     bool
     bool

+ 3 - 0
hw/timer/Kconfig

@@ -21,6 +21,9 @@ config ALLWINNER_A10_PIT
     bool
     bool
     select PTIMER
     select PTIMER
 
 
+config PXA2XX_TIMER
+    bool
+
 config SIFIVE_PWM
 config SIFIVE_PWM
     bool
     bool
 
 

+ 1 - 1
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_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_gptimer.c'))
 system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_synctimer.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_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_SH_TIMER', if_true: files('sh_timer.c'))
 system_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c'))
 system_ss.add(when: 'CONFIG_SLAVIO', if_true: files('slavio_timer.c'))