summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Vervoorn <wvervoorn@eltan.com>2019-11-14 14:42:24 +0100
committerPhilipp Deppenwiese <zaolin.daisuki@gmail.com>2019-11-14 16:00:45 +0000
commitdd0dc1ac9234fd2d6e786146739172eba0d4564f (patch)
tree86949abc6cce51cb1f87c0cd19ab600e62ac2fc7
parentd5777264600bc1d611d6669688bf8a33dac966e2 (diff)
security/intel: Hide Intel submenu when INTEL TXT is disabled
An empty submenu Intel is displayed in security menu when INTEL_TXT is disabled. Enable submenu Intel only when INTEL_TXT is enabled. BUG=N/A TEST=build Change-Id: Iff1d84ff60a15259b60c6205a63a27ecb26346a3 Signed-off-by: Wim Vervoorn <wvervoorn@eltan.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36852 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
-rw-r--r--src/security/intel/Kconfig4
-rw-r--r--src/security/intel/txt/Kconfig4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/security/intel/Kconfig b/src/security/intel/Kconfig
index 333e3857ac..a4525e7b9b 100644
--- a/src/security/intel/Kconfig
+++ b/src/security/intel/Kconfig
@@ -13,8 +13,4 @@
## GNU General Public License for more details.
##
-menu "Intel"
-
source "src/security/intel/txt/Kconfig"
-
-endmenu # Intel
diff --git a/src/security/intel/txt/Kconfig b/src/security/intel/txt/Kconfig
index 011a41cdc3..97d24fd6c9 100644
--- a/src/security/intel/txt/Kconfig
+++ b/src/security/intel/txt/Kconfig
@@ -26,6 +26,8 @@ config INTEL_TXT
if INTEL_TXT
+menu "Intel"
+
config INTEL_TXT_BIOSACM_FILE
string "BIOS ACM file"
default "3rdparty/blobs/soc/intel/fsp_broadwell_de/biosacm.bin" if SOC_INTEL_FSP_BROADWELL_DE
@@ -51,4 +53,6 @@ config INTEL_TXT_BIOSACM_ALIGNMENT
Exceptions are Ivy- and Sandy Bridge with 64KB and Purely with 256KB
alignment size. Please overwrite it SoC specific.
+endmenu # Intel
+
endif