i2c: express dependencies with Kconfig

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Acked-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20190123065618.3520-38-yang.zhong@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 917b18dd48a45cbea774fa3f54f8c51a5ea1fa3b..8ced4e89942b9ce3678e7a8b37bedf410f54b63f 100644 (file)
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -69,7 +69,6 @@ CONFIG_CADENCE=y
 CONFIG_XGMAC=y
 CONFIG_EXYNOS4=y
 CONFIG_PXA2XX=y
-CONFIG_I2C=y
 CONFIG_BITBANG_I2C=y
 CONFIG_FRAMEBUFFER=y
 CONFIG_XILINX_SPIPS=y

diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index ed234c12a9c40b822d947822d782e861a3e56fdf..98552e1da567b660525c2c91835d30342df8e78d 100644 (file)
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -24,8 +24,6 @@ CONFIG_NVDIMM=y
 CONFIG_ACPI_NVDIMM=y
 CONFIG_PXB=y
 CONFIG_ACPI_VMGENID=y
-CONFIG_SMBUS_EEPROM=y
-CONFIG_I2C=y
 CONFIG_PCI_DEVICES=y
 
 # Boards:

diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index 45c599b02f62e53d1a5c72da7d81fbdadc12c176..0795d522dbf53065714deb6a7dc40e3eed950cc0 100644 (file)
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -33,7 +33,6 @@ CONFIG_MC146818RTC=y
 CONFIG_EMPTY_SLOT=y
 CONFIG_MIPS_CPS=y
 CONFIG_MIPS_ITU=y
-CONFIG_I2C=y
 CONFIG_R4K=y
 CONFIG_MALTA=y
 CONFIG_MIPSSIM=y

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index d4807b3d289150597bd2c50624ccce7677052432..0e46d6ab2f4b71bd4137ac00d673dc4ceb037d5b 100644 (file)
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -32,7 +32,6 @@ CONFIG_USB_EHCI_SYSBUS=y
 CONFIG_SM501=y
 CONFIG_DDC=y
 CONFIG_IDE_SII3112=y
-CONFIG_I2C=y
 CONFIG_AT24C=y
 CONFIG_BITBANG_I2C=y
 CONFIG_M41T80=y

diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index 3f7fbe2fa94cbe4cb817a8604f03fcb4b3b925d3..8b003e11146a9734b42295ab8197d1aba31c6cd9 100644 (file)
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -9,7 +9,6 @@ CONFIG_PFLASH_CFI02=y
 CONFIG_SH4=y
 CONFIG_IDE_MMIO=y
 CONFIG_SM501=y
-CONFIG_I2C=y
 CONFIG_DDC=y
 CONFIG_TEST_DEVICES=y
 CONFIG_I82378=y

diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index 17f07a41037801346eea1070d31f624ba5295457..6f58242974ecf1dc088ec48a347396fffa562300 100644 (file)
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -9,7 +9,6 @@ CONFIG_PFLASH_CFI02=y
 CONFIG_SH4=y
 CONFIG_IDE_MMIO=y
 CONFIG_SM501=y
-CONFIG_I2C=y
 CONFIG_DDC=y
 CONFIG_TEST_DEVICES=y
 CONFIG_I82378=y

diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 2d9b42db19f9ce15db54e6925a5f42fb1001ba01..82aa7fab8e42caf409001c1316c0712a0f1aaa99 100644 (file)
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -10,7 +10,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += display/
 devices-dirs-$(CONFIG_SOFTMMU) += dma/
 devices-dirs-$(CONFIG_SOFTMMU) += gpio/
 devices-dirs-$(CONFIG_HYPERV) += hyperv/
-devices-dirs-$(CONFIG_SOFTMMU) += i2c/
+devices-dirs-$(CONFIG_I2C) += i2c/
 devices-dirs-$(CONFIG_SOFTMMU) += ide/
 devices-dirs-$(CONFIG_SOFTMMU) += input/
 devices-dirs-$(CONFIG_SOFTMMU) += intc/

diff --git a/hw/audio/Kconfig b/hw/audio/Kconfig
index 01aea559c0e5dd140f46c334294a8c65f93b4f50..e9c6fed8261eb54fd8f49cd88d5b02d55334e98d 100644 (file)
--- a/hw/audio/Kconfig
+++ b/hw/audio/Kconfig
@@ -40,6 +40,7 @@ config PCSPK
 
 config WM8750
     bool
+    depends on I2C
 
 config PL041
     bool

diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index e5f347f6955ff15de87505fb77670ce05a3d0966..5393116ed4cd83589b3862a44a0e687902abcd41 100644 (file)
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -24,9 +24,11 @@ config PL110
 
 config SII9022
     bool
+    depends on I2C
 
 config SSD0303
     bool
+    depends on I2C
 
 config SSD0323
     bool
@@ -71,6 +73,7 @@ config MILKYMIST_TMU2
 
 config SM501
     bool
+    select I2C
 
 config TCX
     bool

diff --git a/hw/gpio/Kconfig b/hw/gpio/Kconfig
index d0a4abf93f9a079661ed6d94fadfb50563529005..9227cb55987fd76b88f517839095508648b97e53 100644 (file)
--- a/hw/gpio/Kconfig
+++ b/hw/gpio/Kconfig
@@ -1,5 +1,6 @@
 config MAX7310
     bool
+    depends on I2C
 
 config PL061
     bool

diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig
index d6d44026087d246c0032a1248c57704b8c4dbdfa..74c9328729075435ff5caceae0d8237ba5045d59 100644 (file)
--- a/hw/i2c/Kconfig
+++ b/hw/i2c/Kconfig
@@ -3,18 +3,24 @@ config I2C
 
 config SMBUS_EEPROM
     bool
+    depends on I2C
 
 config DDC
     bool
+    depends on I2C
 
 config VERSATILE_I2C
     bool
+    select I2C
 
 config ACPI_SMBUS
     bool
+    select I2C
 
 config BITBANG_I2C
     bool
+    select I2C
 
 config IMX_I2C
     bool
+    select I2C

diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index b5b2f4f866099ec76e136c0c6d4b584dd57c2c1f..a1a388371fab8d574b826edc3bf8a8a5ff605d49 100644 (file)
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -28,6 +28,7 @@ config PC_ACPI
     select ACPI_X86
     select ACPI_CPU_HOTPLUG
     select ACPI_MEMORY_HOTPLUG
+    select SMBUS_EEPROM
     depends on ACPI_SMBUS
 
 config I440FX

diff --git a/hw/input/Kconfig b/hw/input/Kconfig
index 814f87fb980674ef509a9ee23f69c28f5e4374fa..e05b7bee2408c9e78a881c2e84034959a60511d9 100644 (file)
--- a/hw/input/Kconfig
+++ b/hw/input/Kconfig
@@ -3,6 +3,7 @@ config ADB
 
 config LM832X
     bool
+    depends on I2C
 
 config PCKBD
     bool

diff --git a/hw/isa/Kconfig b/hw/isa/Kconfig
index 6f0812d270d1a883d61a56947fc57af652a3a1a5..fcd87b4d1fd34914ad930ba44830e7c24d178d8e 100644 (file)
--- a/hw/isa/Kconfig
+++ b/hw/isa/Kconfig
@@ -19,6 +19,7 @@ config PIIX4
 config VT82C686
     bool
     select ISA_BUS
+    select ACPI_SMBUS
 
 config SMC37C669
     bool

diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 41d8633f7804cd12037995d57a9cfcab1913a0af..5f63701134776217b0df132d6f410d4e099a8128 100644 (file)
--- a/hw/misc/Kconfig
+++ b/hw/misc/Kconfig
@@ -7,9 +7,11 @@ config MAX111X
 
 config TMP105
     bool
+    depends on I2C
 
 config TMP421
     bool
+    depends on I2C
 
 config ISA_DEBUG
     bool
@@ -36,6 +38,7 @@ config EDU
 
 config PCA9552
     bool
+    depends on I2C
 
 config PL310
     bool
@@ -102,5 +105,6 @@ config PVPANIC
 
 config AUX
     bool
+    select I2C
 
 source macio/Kconfig

diff --git a/hw/nvram/Kconfig b/hw/nvram/Kconfig
index 1f5ec95d8bd0f1cca5d010b1bc179bdb9fc9159f..ebaa749ce9d6d1d112a04a7edee8bc0d01933c44 100644 (file)
--- a/hw/nvram/Kconfig
+++ b/hw/nvram/Kconfig
@@ -3,6 +3,7 @@ config DS1225Y
 
 config AT24C
     bool
+    depends on I2C
 
 config MAC_NVRAM
     bool

diff --git a/hw/timer/Kconfig b/hw/timer/Kconfig
index 7dbc1211ab562dd4f8d252df40fa96a917c07cd6..e1a6e7469b89a245000f00955932f9c1d2bbcba5 100644 (file)
--- a/hw/timer/Kconfig
+++ b/hw/timer/Kconfig
@@ -9,6 +9,7 @@ config A9_GTIMER
 
 config DS1338
     bool
+    depends on I2C
 
 config HPET
     bool
@@ -18,6 +19,7 @@ config I8254
 
 config M41T80
     bool
+    depends on I2C
 
 config M48T59
     bool
@@ -27,6 +29,7 @@ config PL031
 
 config TWL92230
     bool
+    depends on I2C
 
 config XLNX_ZYNQMP
     bool