mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/KConfig: Replace ZAURUS with ZAURUS_SCOOP

Browse Source 
The ZAURUS KConfig symbol used to do multiple things:
 * pull in the tc6393xb display device
 * pull in the Zaurus SCOOP GPIO device
 * pull in hw/block/nand.c code
 * pull in hw/block/ecc.c code
and was used by multiple machine types in the Zaurus family.

Now that we've removed all the Zaurus machine types except
"collie" (which is not currently deprecated), we can simplify
this. "collie" doesn't need any of the above things except
for the SCOOP GPIO device.

Remove the does-lots-of-things ZAURUS KConfig symbol and instead have
collie pull in ZAURUS_SCOOP, a new KConfig symbol which exists only
to control the presence of the SCOOP GPIO device.  Move the
associated source file lines in MAINTAINERS into the Collie
subsection, since this is now its only user.

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-8-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2024-09-03 17:07:05 +01:00
parent 3575462b5f
commit 504f935d00
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -937,12 +937,10 @@ F: hw/arm/mainstone.c
F: hw/arm/z2.c F: hw/arm/z2.c
F: hw/*/pxa2xx* F: hw/*/pxa2xx*
F: hw/gpio/max7310.c F: hw/gpio/max7310.c
F: hw/gpio/zaurus.c
F: hw/misc/mst_fpga.c F: hw/misc/mst_fpga.c
F: hw/adc/max111x.c F: hw/adc/max111x.c
F: include/hw/adc/max111x.h F: include/hw/adc/max111x.h
F: include/hw/arm/pxa.h F: include/hw/arm/pxa.h
F: include/hw/arm/sharpsl.h
F: docs/system/arm/mainstone.rst F: docs/system/arm/mainstone.rst
SABRELITE / i.MX6 SABRELITE / i.MX6
@ -981,6 +979,8 @@ L: qemu-arm@nongnu.org
S: Odd Fixes S: Odd Fixes
F: hw/arm/collie.c F: hw/arm/collie.c
F: hw/arm/strongarm* F: hw/arm/strongarm*
F: hw/gpio/zaurus.c
F: include/hw/arm/sharpsl.h
F: docs/system/arm/collie.rst F: docs/system/arm/collie.rst
Stellaris Stellaris

7
hw/arm/Kconfig
View File

@ -300,7 +300,7 @@ config COLLIE
default y default y
depends on TCG && ARM depends on TCG && ARM
select PFLASH_CFI01 select PFLASH_CFI01
select ZAURUS # scoop select ZAURUS_SCOOP
select STRONGARM select STRONGARM
config SX1 config SX1
@ -662,11 +662,6 @@ config MSF2
select SSI select SSI
select UNIMP select UNIMP
config ZAURUS
bool
select NAND
select ECC
config ARMSSE config ARMSSE
bool bool
select ARM_V7M select ARM_V7M

3
hw/gpio/Kconfig
View File

@ -23,3 +23,6 @@ config STM32L4X5_GPIO
config PCF8574 config PCF8574
bool bool
depends on I2C depends on I2C
config ZAURUS_SCOOP
bool

2
hw/gpio/meson.build
View File

@ -5,7 +5,7 @@ system_ss.add(when: 'CONFIG_MAX7310', if_true: files('max7310.c'))
system_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c')) system_ss.add(when: 'CONFIG_PCA9552', if_true: files('pca9552.c'))
system_ss.add(when: 'CONFIG_PCA9554', if_true: files('pca9554.c')) system_ss.add(when: 'CONFIG_PCA9554', if_true: files('pca9554.c'))
system_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c')) system_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c'))
system_ss.add(when: 'CONFIG_ZAURUS', if_true: files('zaurus.c')) system_ss.add(when: 'CONFIG_ZAURUS_SCOOP', if_true: files('zaurus.c'))
system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c')) system_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c'))
system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_gpio.c')) system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_gpio.c'))