summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2019-01-29 12:16:25 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2019-03-07 21:45:53 +0100
commitdd2356e5316eae78876602a57608e33e2de85e11 (patch)
treef036dd585986da36d96166a98957061f0557cef8
parent464399a9b4ae81d7dad33a4acb30dfb76c7b1bd2 (diff)
downloadfocaccia-qemu-dd2356e5316eae78876602a57608e33e2de85e11.tar.gz
focaccia-qemu-dd2356e5316eae78876602a57608e33e2de85e11.zip
ipmi: express dependencies with kconfig
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
Message-Id: <20190123065618.3520-36-yang.zhong@intel.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--default-configs/i386-softmmu.mak3
-rw-r--r--default-configs/ppc64-softmmu.mak3
-rw-r--r--hw/ipmi/Kconfig6
3 files changed, 6 insertions, 6 deletions
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 53e9d5e965..e779ee1676 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -1,9 +1,6 @@
 # Default configuration for i386-softmmu
 
 CONFIG_VMXNET3_PCI=y
-CONFIG_IPMI=y
-CONFIG_IPMI_LOCAL=y
-CONFIG_IPMI_EXTERN=y
 CONFIG_ISA_IPMI_KCS=y
 CONFIG_ISA_IPMI_BT=y
 
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index a0a9151328..d642b6752d 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -5,9 +5,6 @@ include ppc-softmmu.mak
 
 # For PowerNV
 CONFIG_POWERNV=y
-CONFIG_IPMI=y
-CONFIG_IPMI_LOCAL=y
-CONFIG_IPMI_EXTERN=y
 CONFIG_ISA_IPMI_BT=y
 
 # For pSeries
diff --git a/hw/ipmi/Kconfig b/hw/ipmi/Kconfig
index 6a4f08f2fa..b944fae100 100644
--- a/hw/ipmi/Kconfig
+++ b/hw/ipmi/Kconfig
@@ -3,14 +3,20 @@ config IPMI
 
 config IPMI_LOCAL
     bool
+    default y
+    depends on IPMI
 
 config IPMI_EXTERN
     bool
+    default y
+    depends on IPMI
 
 config ISA_IPMI_KCS
     bool
     depends on ISA_BUS
+    select IPMI
 
 config ISA_IPMI_BT
     bool
     depends on ISA_BUS
+    select IPMI