ssi: express dependencies with kconfig

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 40e1a1abed03a020a24c4eff48d481b3709a8e3d..8bb4fd19269b16680dde3c0ad844bab1638c16d7 100644 (file)
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -24,7 +24,6 @@ CONFIG_DDC=y
 CONFIG_SII9022=y
 CONFIG_ADS7846=y
 CONFIG_MAX111X=y
-CONFIG_SSI=y
 CONFIG_SSI_SD=y
 CONFIG_SSI_M25P80=y
 CONFIG_LAN9118=y

diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak
index a4a67705ba4e7815dd00aab3dc0599653ca2ab35..7140ef31995f1854a448fad62792cc3497a6873a 100644 (file)
--- a/default-configs/microblaze-softmmu.mak
+++ b/default-configs/microblaze-softmmu.mak
@@ -6,7 +6,6 @@ CONFIG_XILINX=y
 CONFIG_XILINX_AXI=y
 CONFIG_XILINX_SPI=y
 CONFIG_XILINX_ETHLITE=y
-CONFIG_SSI=y
 CONFIG_SSI_M25P80=y
 CONFIG_XLNX_ZYNQMP=y
 CONFIG_PETALOGIX_S3ADSP1800=y

diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig
index c6c5dfb09f5c3de6297d7775f22c6c73c4bf4de7..8f12d9c1bb4793d11ec1a16d4a8847c5be05a020 100644 (file)
--- a/hw/sd/Kconfig
+++ b/hw/sd/Kconfig
@@ -3,6 +3,7 @@ config PL181
 
 config SSI_SD
     bool
+    depends on SSI
 
 config SD
     bool

diff --git a/hw/ssi/Kconfig b/hw/ssi/Kconfig
index 5a03110a8ded55abae7b02f2959a98077237c4db..9e54a0c8dd4379b430c7bec6895f6b88f3c2e6d3 100644 (file)
--- a/hw/ssi/Kconfig
+++ b/hw/ssi/Kconfig
@@ -1,14 +1,18 @@
 config PL022
     bool
+    select SSI
 
 config SSI
     bool
 
 config XILINX_SPI
     bool
+    select SSI
 
 config XILINX_SPIPS
     bool
+    select SSI
 
 config STM32F2XX_SPI
     bool
+    select SSI