From 504f935d00e5491ac8296e40d050bbe2b95338c3 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 3 Sep 2024 17:07:05 +0100 Subject: [PATCH] hw/arm/KConfig: Replace ZAURUS with ZAURUS_SCOOP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-id: 20240903160751.4100218-8-peter.maydell@linaro.org --- MAINTAINERS | 4 ++-- hw/arm/Kconfig | 7 +------ hw/gpio/Kconfig | 3 +++ hw/gpio/meson.build | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index bb74aff54c..d917343a6f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -937,12 +937,10 @@ F: hw/arm/mainstone.c F: hw/arm/z2.c F: hw/*/pxa2xx* F: hw/gpio/max7310.c -F: hw/gpio/zaurus.c F: hw/misc/mst_fpga.c F: hw/adc/max111x.c F: include/hw/adc/max111x.h F: include/hw/arm/pxa.h -F: include/hw/arm/sharpsl.h F: docs/system/arm/mainstone.rst SABRELITE / i.MX6 @@ -981,6 +979,8 @@ L: qemu-arm@nongnu.org S: Odd Fixes F: hw/arm/collie.c F: hw/arm/strongarm* +F: hw/gpio/zaurus.c +F: include/hw/arm/sharpsl.h F: docs/system/arm/collie.rst Stellaris diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 32c5e601d1..c8c57497c5 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -300,7 +300,7 @@ config COLLIE default y depends on TCG && ARM select PFLASH_CFI01 - select ZAURUS # scoop + select ZAURUS_SCOOP select STRONGARM config SX1 @@ -662,11 +662,6 @@ config MSF2 select SSI select UNIMP -config ZAURUS - bool - select NAND - select ECC - config ARMSSE bool select ARM_V7M diff --git a/hw/gpio/Kconfig b/hw/gpio/Kconfig index 19c97cc823..843630d4f5 100644 --- a/hw/gpio/Kconfig +++ b/hw/gpio/Kconfig @@ -23,3 +23,6 @@ config STM32L4X5_GPIO config PCF8574 bool depends on I2C + +config ZAURUS_SCOOP + bool diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build index a7495d196a..089b24802e 100644 --- a/hw/gpio/meson.build +++ b/hw/gpio/meson.build @@ -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_PCA9554', if_true: files('pca9554.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_NPCM7XX', if_true: files('npcm7xx_gpio.c'))