From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: thuth@redhat.com, Yang Zhong <yang.zhong@intel.com>
Subject: [Qemu-devel] [PULL 20/54] i2c: express dependencies with Kconfig
Date: Mon, 4 Mar 2019 19:19:40 +0100 [thread overview]
Message-ID: <1551723614-1823-21-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1551723614-1823-1-git-send-email-pbonzini@redhat.com>
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>
---
default-configs/arm-softmmu.mak | 1 -
default-configs/i386-softmmu.mak | 2 --
default-configs/mips-softmmu-common.mak | 1 -
default-configs/ppc-softmmu.mak | 1 -
default-configs/sh4-softmmu.mak | 1 -
default-configs/sh4eb-softmmu.mak | 1 -
hw/Makefile.objs | 2 +-
hw/audio/Kconfig | 1 +
hw/display/Kconfig | 3 +++
hw/gpio/Kconfig | 1 +
hw/i2c/Kconfig | 6 ++++++
hw/i386/Kconfig | 1 +
hw/input/Kconfig | 1 +
hw/isa/Kconfig | 1 +
hw/misc/Kconfig | 4 ++++
hw/nvram/Kconfig | 1 +
hw/timer/Kconfig | 3 +++
17 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 917b18d..8ced4e8 100644
--- 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 ed234c1..98552e1 100644
--- 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 45c599b..0795d52 100644
--- 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 d4807b3..0e46d6a 100644
--- 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 3f7fbe2..8b003e1 100644
--- 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 17f07a4..6f58242 100644
--- 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 2d9b42d..82aa7fa 100644
--- 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 01aea55..e9c6fed 100644
--- 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 4941773..fc129f6 100644
--- 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 d0a4abf..9227cb5 100644
--- 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 d6d4402..74c9328 100644
--- 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 081855e..9cd24d7 100644
--- 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 814f87f..e05b7be 100644
--- 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 6f0812d..fcd87b4 100644
--- 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 41d8633..5f63701 100644
--- 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 1f5ec95..ebaa749 100644
--- 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 7dbc121..e1a6e74 100644
--- 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
--
1.8.3.1
next prev parent reply other threads:[~2019-03-04 18:20 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-04 18:19 [Qemu-devel] [PULL 00/54] Kconfig conversion, excluding ARM and MIPS Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 01/54] block: fix recursion in hw/block/dataplane Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 02/54] 9pfs: remove unnecessary conditionals Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 03/54] xtensa: rename CONFIG_XTENSA_FPGA to CONFIG_XTENSA_XTFPGA Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 04/54] minikconfig: add parser skeleton Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 05/54] minikconfig: add AST Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 06/54] minikconfig: add semantic analysis Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 07/54] hw/display: make edid configurable Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 08/54] kconfig: introduce kconfig files Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 09/54] build: switch to Kconfig Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 10/54] minikconfig: implement allnoconfig and defconfig modes Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 11/54] kconfig: introduce CONFIG_TEST_DEVICES Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 12/54] ide: express dependencies with Kconfig Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 13/54] hw/pci/Makefile.objs: make pcie configurable Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 14/54] isa: express dependencies with kconfig Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 15/54] build: convert pci.mak to Kconfig Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 16/54] build: convert sound.mak " Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 17/54] scsi: express dependencies with Kconfig Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 18/54] build: convert usb.mak to Kconfig Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 19/54] i386: express dependencies with Kconfig Paolo Bonzini
2019-03-04 18:19 ` Paolo Bonzini [this message]
2019-03-04 18:19 ` [Qemu-devel] [PULL 21/54] ptimer: " Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 22/54] display: express dependencies with kconfig Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 23/54] hyperv: " Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 24/54] vfio: express vfio dependencies with Kconfig Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 25/54] virtio: express virtio " Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 26/54] tpm: express " Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 27/54] isa: express SuperIO " Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 28/54] ssi: express dependencies with kconfig Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 29/54] sd: " Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 30/54] ipmi: " Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 31/54] i386-softmmu.mak: remove all CONFIG_* except boards definitions Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 32/54] ppc64: Express dependencies of 'pseries' and 'powernv' machines with kconfig Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 33/54] ppc: Express dependencies of the 'prep' and '40p' " Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 34/54] ppc: Express dependencies of the Mac " Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 35/54] ppc: Express dependencies of the Sam460EX " Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 36/54] ppc: Express dependencies of the embedded " Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 37/54] alpha-softmmu.mak: express dependencies with Kconfig Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 38/54] cris-softmmu.mak: " Paolo Bonzini
2019-03-04 18:19 ` [Qemu-devel] [PULL 39/54] hppa-softmmu.mak: " Paolo Bonzini
2019-03-04 18:20 ` [Qemu-devel] [PULL 40/54] lm32-softmmu.mak: " Paolo Bonzini
2019-03-04 23:55 ` Philippe Mathieu-Daudé
2019-03-04 18:20 ` [Qemu-devel] [PULL 41/54] m68k-softmmu.mak: " Paolo Bonzini
2019-03-04 18:20 ` [Qemu-devel] [PULL 42/54] microblaze-softmmu.mak: " Paolo Bonzini
2019-03-04 18:20 ` [Qemu-devel] [PULL 43/54] moxie-softmmu.mak: " Paolo Bonzini
2019-03-04 18:20 ` [Qemu-devel] [PULL 44/54] nios2-softmmu.mak: " Paolo Bonzini
2019-03-04 18:20 ` [Qemu-devel] [PULL 45/54] or1k-softmmu.mak: " Paolo Bonzini
2019-03-04 18:20 ` [Qemu-devel] [PULL 46/54] riscv-softmmu.mak: replace CONFIG_* with Kconfig "select" directives Paolo Bonzini
2019-03-04 18:20 ` [Qemu-devel] [PULL 47/54] s390x: express dependencies with Kconfig Paolo Bonzini
2019-03-04 18:20 ` [Qemu-devel] [PULL 48/54] sh4-softmmu.mak: " Paolo Bonzini
2019-03-04 18:20 ` [Qemu-devel] [PULL 49/54] sparc-softmmu.mak: " Paolo Bonzini
2019-03-04 18:20 ` [Qemu-devel] [PULL 50/54] sparc64-softmmu.mak: " Paolo Bonzini
2019-03-04 18:20 ` [Qemu-devel] [PULL 51/54] unicore32-softmmu.mak: " Paolo Bonzini
2019-03-04 18:20 ` [Qemu-devel] [PULL 52/54] xtensa-softmmu.mak: " Paolo Bonzini
2019-03-04 18:20 ` [Qemu-devel] [PULL 53/54] .travis.yml: test that no-default-device builds do not regress Paolo Bonzini
2019-03-04 18:20 ` [Qemu-devel] [PULL 54/54] kconfig: add documentation Paolo Bonzini
2019-03-04 20:16 ` [Qemu-devel] [PULL 00/54] Kconfig conversion, excluding ARM and MIPS no-reply
2019-03-05 9:32 ` Peter Maydell
2019-03-05 19:45 ` Thomas Huth
2019-03-05 20:08 ` Eric Blake
2019-03-05 20:29 ` Philippe Mathieu-Daudé
2019-03-06 10:12 ` Thomas Huth
2019-03-08 20:52 ` Eric Blake
2019-03-06 10:57 ` Paolo Bonzini
2019-03-06 11:04 ` Thomas Huth
2019-03-06 11:14 ` Philippe Mathieu-Daudé
2019-03-06 11:15 ` Paolo Bonzini
2019-03-07 13:25 ` Peter Maydell
2019-03-07 13:47 ` Philippe Mathieu-Daudé
2019-03-07 14:09 ` Paolo Bonzini
2019-03-07 13:55 ` Paolo Bonzini
2019-03-08 16:23 ` no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1551723614-1823-21-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=yang.zhong@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).