summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWim Vervoorn <wvervoorn@eltan.com>2019-11-14 14:10:28 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-11-16 20:41:10 +0000
commite32d16f9d7a10cf5c65e62d428d0eafda137e552 (patch)
tree0ddc8229243a643f5e54a14efb9b77b338a3d2a7 /src
parent0f476df76b6d022c139edc33dc2c892d7e6a4eaf (diff)
downloadcoreboot-e32d16f9d7a10cf5c65e62d428d0eafda137e552.tar.xz
vendorcode/eltan/security: Move eltan security from chipset to security menu
The eltan security items ended up in the chipset menu which is not desired. Now the eltan security option (when enabled in mainboard) shows up in the security menu. BUG=N/A TEST=build Change-Id: I3b2aa3836e8d9a3242c6d1f3ba7b7821a5cfb9d3 Signed-off-by: Wim Vervoorn <wvervoorn@eltan.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36851 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
Diffstat (limited to 'src')
-rw-r--r--src/Kconfig1
-rw-r--r--src/vendorcode/eltan/Kconfig21
-rw-r--r--src/vendorcode/eltan/security/Kconfig9
3 files changed, 10 insertions, 21 deletions
diff --git a/src/Kconfig b/src/Kconfig
index 56ebe82e02..ba9ae86067 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -461,6 +461,7 @@ endmenu
menu "Security"
source "src/security/Kconfig"
+source "src/vendorcode/eltan/security/Kconfig"
endmenu
diff --git a/src/vendorcode/eltan/Kconfig b/src/vendorcode/eltan/Kconfig
deleted file mode 100644
index 30bb8b8ab8..0000000000
--- a/src/vendorcode/eltan/Kconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright (C) 2019 Eltan B.V.
-##
-## This program is free software; you can redistribute it and/or modify
-## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; version 2 of the License.
-##
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-
-config USE_VENDORCODE_ELTAN
- bool
-
-if USE_VENDORCODE_ELTAN
-source src/vendorcode/eltan/security/Kconfig
-endif
diff --git a/src/vendorcode/eltan/security/Kconfig b/src/vendorcode/eltan/security/Kconfig
index 6b93d2a97a..1cc0365720 100644
--- a/src/vendorcode/eltan/security/Kconfig
+++ b/src/vendorcode/eltan/security/Kconfig
@@ -12,7 +12,16 @@
## GNU General Public License for more details.
##
+config USE_VENDORCODE_ELTAN
+ bool
+
+if USE_VENDORCODE_ELTAN
+
menu "Eltan Security Settings"
+
source src/vendorcode/eltan/security/mboot/Kconfig
source src/vendorcode/eltan/security/verified_boot/Kconfig
+
endmenu
+
+endif