clear-pkgs-linux-iot-lts2018/0526-Cleanup-Kconfig.patch

79 lines
2.2 KiB
Diff

From 439309a545b04cc975432de8a3a620e371f48075 Mon Sep 17 00:00:00 2001
From: "Yan, Like" <like.yan@intel.com>
Date: Fri, 31 Aug 2018 10:58:59 +0800
Subject: [PATCH 526/743] Cleanup Kconfig
Change-Id: I219bc9343fe47a1cdab70c247370beb9e425fcd4
Signed-off-by: Yan, Like
---
drivers/acrn/Kconfig | 5 +++--
drivers/vbs/Kconfig | 4 ++--
drivers/vhm/Kconfig | 1 -
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/acrn/Kconfig b/drivers/acrn/Kconfig
index 9056a4f1f20a..9fc4cae04a56 100644
--- a/drivers/acrn/Kconfig
+++ b/drivers/acrn/Kconfig
@@ -1,12 +1,13 @@
config ACRN_SHARED_BUFFER
bool "Intel ACRN SHARED BUFFER"
+ depends on ACRN_VHM
---help---
Ring buffer shared between ACRN Hypervisor and its SOS.
Help ACRN performance profiling.
config ACRN_TRACE
tristate "Intel ACRN Hypervisor Trace support"
- select ACRN_SHARED_BUFFER
+ depends on ACRN_SHARED_BUFFER
---help---
This is the Trace driver for the Intel ACRN hypervisor.
You can say y to build it into the kernel, or m to build
@@ -14,7 +15,7 @@ config ACRN_TRACE
config ACRN_HVLOG
bool "Intel ACRN Hypervisor Logmsg support"
- select ACRN_SHARED_BUFFER
+ depends on ACRN_SHARED_BUFFER
---help---
This is the Trace driver for the Intel ACRN hypervisor log.
You can say y to build it into the kernel.
diff --git a/drivers/vbs/Kconfig b/drivers/vbs/Kconfig
index e3bb44d6a5e9..663d09c2c42f 100644
--- a/drivers/vbs/Kconfig
+++ b/drivers/vbs/Kconfig
@@ -2,7 +2,7 @@
# This Kconfig describes VBS for ACRN hypervisor
#
config VBS
- tristate "Enable VBS framework for ACRN hypervisor"
+ bool "Enable VBS framework for ACRN hypervisor"
depends on ACRN
depends on ACRN_VHM
default n
@@ -20,7 +20,7 @@ config VBS_DEBUG
say N here. This enables ACRN VBS debugging.
config VBS_RNG
- tristate "ACRN VBS reference driver: virtio RNG"
+ bool "ACRN VBS reference driver: virtio RNG"
depends on VBS != n
default n
---help---
diff --git a/drivers/vhm/Kconfig b/drivers/vhm/Kconfig
index 0b0faeeff74a..e59b9487cd65 100644
--- a/drivers/vhm/Kconfig
+++ b/drivers/vhm/Kconfig
@@ -3,7 +3,6 @@ config ACRN_VHM
depends on ACRN
depends on DMA_CMA
depends on PCI_MSI
- depends on !INTEL_IOMMU
depends on !VMAP_STACK
default n
---help---
--
2.19.2