[coreboot-gerrit] Change in coreboot[master]: src/security: Move vboot2 to security kconfig section

Philipp Deppenwiese (Code Review) gerrit at coreboot.org
Tue Oct 17 17:04:48 CEST 2017 

Philipp Deppenwiese has uploaded this change for review. ( https://review.coreboot.org/22074


Change subject: src/security: Move vboot2 to security kconfig section
......................................................................

src/security: Move vboot2 to security kconfig section

This commit just moves the vboot sources into
the security directory and fixes kconfig/makefile paths.

Change-Id: Icd87f95640186f7a625242a3937e1dd13347eb60
Signed-off-by: Philipp Deppenwiese <zaolin at das-labor.org>
---
M Makefile.inc
M src/Kconfig
M src/security/Kconfig
A src/security/Makefile.inc
R src/security/vboot/Kconfig
R src/security/vboot/Makefile.inc
R src/security/vboot/bootmode.c
R src/security/vboot/common.c
R src/security/vboot/misc.h
R src/security/vboot/secdata_mock.c
R src/security/vboot/secdata_tpm.c
R src/security/vboot/symbols.h
R src/security/vboot/vbnv.c
R src/security/vboot/vbnv.h
R src/security/vboot/vbnv_cmos.c
R src/security/vboot/vbnv_ec.c
R src/security/vboot/vbnv_flash.c
R src/security/vboot/vbnv_layout.h
R src/security/vboot/vboot_common.c
R src/security/vboot/vboot_common.h
R src/security/vboot/vboot_handoff.c
R src/security/vboot/vboot_loader.c
R src/security/vboot/vboot_logic.c
R src/security/vboot/verstage.c
24 files changed, 33 insertions(+), 30 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/74/22074/1

diff --git a/Makefile.inc b/Makefile.inc
index fefc8d1..0e5395d 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -91,7 +91,7 @@
 subdirs-y += util/futility util/marvell util/blobtool
 subdirs-y += $(wildcard src/arch/*)
 subdirs-y += src/mainboard/$(MAINBOARDDIR)
-subdirs-y += src/vboot
+subdirs-y += src/security
 subdirs-y += payloads payloads/external
 
 subdirs-y += site-local
diff --git a/src/Kconfig b/src/Kconfig
index 7d10e19..f57ace7 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -348,7 +348,6 @@
 source "src/drivers/intel/fsp1_0/Kconfig"
 
 source "src/southbridge/intel/common/firmware/Kconfig"
-source "src/vboot/Kconfig"
 source "src/vendorcode/*/Kconfig"
 
 source "src/arch/*/Kconfig"
diff --git a/src/security/Kconfig b/src/security/Kconfig
index 7ec2952..563e375 100644
--- a/src/security/Kconfig
+++ b/src/security/Kconfig
@@ -11,3 +11,9 @@
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 ##
+
+menu "Verified Boot (vboot)"
+
+source "src/security/vboot/Kconfig"
+
+endmenu # Verified Boot (vboot)
diff --git a/src/security/Makefile.inc b/src/security/Makefile.inc
new file mode 100644
index 0000000..d2e1e60
--- /dev/null
+++ b/src/security/Makefile.inc
@@ -0,0 +1 @@
+subdirs-y += vboot
diff --git a/src/vboot/Kconfig b/src/security/vboot/Kconfig
similarity index 98%
rename from src/vboot/Kconfig
rename to src/security/vboot/Kconfig
index d5b5de2..e63cf2b 100644
--- a/src/vboot/Kconfig
+++ b/src/security/vboot/Kconfig
@@ -12,8 +12,6 @@
 ## GNU General Public License for more details.
 ##
 
-menu "Verified Boot (vboot)"
-
 config VBOOT
 	bool "Verify firmware with vboot."
 	default n
@@ -331,4 +329,3 @@
 
 endmenu # Keys
 endif # VBOOT
-endmenu # Verified Boot (vboot)
diff --git a/src/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
similarity index 100%
rename from src/vboot/Makefile.inc
rename to src/security/vboot/Makefile.inc
diff --git a/src/vboot/bootmode.c b/src/security/vboot/bootmode.c
similarity index 97%
rename from src/vboot/bootmode.c
rename to src/security/vboot/bootmode.c
index 1207448..834bc48 100644
--- a/src/vboot/bootmode.c
+++ b/src/security/vboot/bootmode.c
@@ -20,9 +20,9 @@
 #include <rules.h>
 #include <string.h>
 #include <vb2_api.h>
-#include <vboot/misc.h>
-#include <vboot/vbnv.h>
-#include <vboot/vboot_common.h>
+#include <security/vboot/misc.h>
+#include <security/vboot/vbnv.h>
+#include <security/vboot/vboot_common.h>
 
 static int vb2_get_recovery_reason_shared_data(void)
 {
diff --git a/src/vboot/common.c b/src/security/vboot/common.c
similarity index 97%
rename from src/vboot/common.c
rename to src/security/vboot/common.c
index 3e480ed..72228e4 100644
--- a/src/vboot/common.c
+++ b/src/security/vboot/common.c
@@ -20,9 +20,9 @@
 #include <reset.h>
 #include <string.h>
 #include <vb2_api.h>
-#include <vboot/misc.h>
-#include <vboot/symbols.h>
-#include <vboot/vboot_common.h>
+#include <security/vboot/misc.h>
+#include <security/vboot/symbols.h>
+#include <security/vboot/vboot_common.h>
 
 struct selected_region {
 	uint32_t offset;
diff --git a/src/vboot/misc.h b/src/security/vboot/misc.h
similarity index 96%
rename from src/vboot/misc.h
rename to src/security/vboot/misc.h
index dc94720..b5e3fcf 100644
--- a/src/vboot/misc.h
+++ b/src/security/vboot/misc.h
@@ -16,7 +16,7 @@
 #ifndef __VBOOT_MISC_H__
 #define __VBOOT_MISC_H__
 
-#include <vboot/vboot_common.h>
+#include <security/vboot/vboot_common.h>
 
 struct vb2_context;
 struct vb2_shared_data;
diff --git a/src/vboot/secdata_mock.c b/src/security/vboot/secdata_mock.c
similarity index 100%
rename from src/vboot/secdata_mock.c
rename to src/security/vboot/secdata_mock.c
diff --git a/src/vboot/secdata_tpm.c b/src/security/vboot/secdata_tpm.c
similarity index 100%
rename from src/vboot/secdata_tpm.c
rename to src/security/vboot/secdata_tpm.c
diff --git a/src/vboot/symbols.h b/src/security/vboot/symbols.h
similarity index 100%
rename from src/vboot/symbols.h
rename to src/security/vboot/symbols.h
diff --git a/src/vboot/vbnv.c b/src/security/vboot/vbnv.c
similarity index 97%
rename from src/vboot/vbnv.c
rename to src/security/vboot/vbnv.c
index 79bdc8e..0fecacd 100644
--- a/src/vboot/vbnv.c
+++ b/src/security/vboot/vbnv.c
@@ -16,8 +16,8 @@
 #include <arch/early_variables.h>
 #include <string.h>
 #include <types.h>
-#include <vboot/vbnv.h>
-#include <vboot/vbnv_layout.h>
+#include <security/vboot/vbnv.h>
+#include <security/vboot/vbnv_layout.h>
 
 static int vbnv_initialized CAR_GLOBAL;
 static uint8_t vbnv[VBOOT_VBNV_BLOCK_SIZE] CAR_GLOBAL;
diff --git a/src/vboot/vbnv.h b/src/security/vboot/vbnv.h
similarity index 100%
rename from src/vboot/vbnv.h
rename to src/security/vboot/vbnv.h
diff --git a/src/vboot/vbnv_cmos.c b/src/security/vboot/vbnv_cmos.c
similarity index 97%
rename from src/vboot/vbnv_cmos.c
rename to src/security/vboot/vbnv_cmos.c
index a311fdd..9c801d8 100644
--- a/src/vboot/vbnv_cmos.c
+++ b/src/security/vboot/vbnv_cmos.c
@@ -17,8 +17,8 @@
 #include <console/console.h>
 #include <types.h>
 #include <pc80/mc146818rtc.h>
-#include <vboot/vbnv.h>
-#include <vboot/vbnv_layout.h>
+#include <security/vboot/vbnv.h>
+#include <security/vboot/vbnv_layout.h>
 
 static void clear_vbnv_battery_cutoff_flag(uint8_t *vbnv_copy)
 {
diff --git a/src/vboot/vbnv_ec.c b/src/security/vboot/vbnv_ec.c
similarity index 92%
rename from src/vboot/vbnv_ec.c
rename to src/security/vboot/vbnv_ec.c
index 99e2b82..d73423e 100644
--- a/src/vboot/vbnv_ec.c
+++ b/src/security/vboot/vbnv_ec.c
@@ -15,8 +15,8 @@
 
 #include <types.h>
 #include <ec/google/chromeec/ec.h>
-#include <vboot/vbnv.h>
-#include <vboot/vbnv_layout.h>
+#include <security/vboot/vbnv.h>
+#include <security/vboot/vbnv_layout.h>
 
 void read_vbnv_ec(uint8_t *vbnv_copy)
 {
diff --git a/src/vboot/vbnv_flash.c b/src/security/vboot/vbnv_flash.c
similarity index 97%
rename from src/vboot/vbnv_flash.c
rename to src/security/vboot/vbnv_flash.c
index dd128a9..07569fa 100644
--- a/src/vboot/vbnv_flash.c
+++ b/src/security/vboot/vbnv_flash.c
@@ -20,9 +20,9 @@
 #include <string.h>
 #include <vb2_api.h>
 #include <vboot_nvstorage.h>
-#include <vboot/vboot_common.h>
-#include <vboot/vbnv.h>
-#include <vboot/vbnv_layout.h>
+#include <security/vboot/vboot_common.h>
+#include <security/vboot/vbnv.h>
+#include <security/vboot/vbnv_layout.h>
 
 #define BLOB_SIZE VB2_NVDATA_SIZE
 
diff --git a/src/vboot/vbnv_layout.h b/src/security/vboot/vbnv_layout.h
similarity index 100%
rename from src/vboot/vbnv_layout.h
rename to src/security/vboot/vbnv_layout.h
diff --git a/src/vboot/vboot_common.c b/src/security/vboot/vboot_common.c
similarity index 98%
rename from src/vboot/vboot_common.c
rename to src/security/vboot/vboot_common.c
index 515b368..3ef9070 100644
--- a/src/vboot/vboot_common.c
+++ b/src/security/vboot/vboot_common.c
@@ -23,7 +23,7 @@
 #include <rules.h>
 #include <stddef.h>
 #include <string.h>
-#include <vboot/vboot_common.h>
+#include <security/vboot/vboot_common.h>
 
 int vboot_named_region_device(const char *name, struct region_device *rdev)
 {
diff --git a/src/vboot/vboot_common.h b/src/security/vboot/vboot_common.h
similarity index 100%
rename from src/vboot/vboot_common.h
rename to src/security/vboot/vboot_common.h
diff --git a/src/vboot/vboot_handoff.c b/src/security/vboot/vboot_handoff.c
similarity index 98%
rename from src/vboot/vboot_handoff.c
rename to src/security/vboot/vboot_handoff.c
index 974fe78..9fecc1a 100644
--- a/src/vboot/vboot_handoff.c
+++ b/src/security/vboot/vboot_handoff.c
@@ -34,8 +34,8 @@
 #include <stdlib.h>
 #include <timestamp.h>
 #include <vboot_struct.h>
-#include <vboot/vbnv.h>
-#include <vboot/misc.h>
+#include <security/vboot/vbnv.h>
+#include <security/vboot/misc.h>
 
 /**
  * Sets vboot_handoff based on the information in vb2_shared_data
diff --git a/src/vboot/vboot_loader.c b/src/security/vboot/vboot_loader.c
similarity index 97%
rename from src/vboot/vboot_loader.c
rename to src/security/vboot/vboot_loader.c
index 6a7e284..17ea0a9 100644
--- a/src/vboot/vboot_loader.c
+++ b/src/security/vboot/vboot_loader.c
@@ -21,9 +21,9 @@
 #include <rmodule.h>
 #include <rules.h>
 #include <string.h>
-#include <vboot/misc.h>
-#include <vboot/symbols.h>
-#include <vboot/vboot_common.h>
+#include <security/vboot/misc.h>
+#include <security/vboot/symbols.h>
+#include <security/vboot/vboot_common.h>
 
 /* Ensure vboot configuration is valid: */
 _Static_assert(IS_ENABLED(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK) +
diff --git a/src/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c
similarity index 99%
rename from src/vboot/vboot_logic.c
rename to src/security/vboot/vboot_logic.c
index d06faa7..e6b97b9 100644
--- a/src/vboot/vboot_logic.c
+++ b/src/security/vboot/vboot_logic.c
@@ -23,8 +23,8 @@
 #include <string.h>
 #include <timestamp.h>
 #include <vb2_api.h>
-#include <vboot/misc.h>
-#include <vboot/vbnv.h>
+#include <security/vboot/misc.h>
+#include <security/vboot/vbnv.h>
 
 /* The max hash size to expect is for SHA512. */
 #define VBOOT_MAX_HASH_SIZE VB2_SHA512_DIGEST_SIZE
diff --git a/src/vboot/verstage.c b/src/security/vboot/verstage.c
similarity index 95%
rename from src/vboot/verstage.c
rename to src/security/vboot/verstage.c
index aca4ab3..c244184 100644
--- a/src/vboot/verstage.c
+++ b/src/security/vboot/verstage.c
@@ -17,7 +17,7 @@
 #include <arch/hlt.h>
 #include <console/console.h>
 #include <program_loading.h>
-#include <vboot/vboot_common.h>
+#include <security/vboot/vboot_common.h>
 
 void __attribute__((weak)) verstage_mainboard_init(void)
 {

-- 
To view, visit https://review.coreboot.org/22074
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd87f95640186f7a625242a3937e1dd13347eb60
Gerrit-Change-Number: 22074
Gerrit-PatchSet: 1
Gerrit-Owner: Philipp Deppenwiese <zaolin.daisuki at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20171017/67bd8193/attachment-0001.html>

More information about the coreboot-gerrit mailing list