summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans Hendriks <fhendriks@eltan.com>2019-06-13 14:58:22 +0200
committerMartin Roth <martinroth@google.com>2019-08-08 03:37:51 +0000
commitf4d2c8714f9910def04243731818ca7449d0afa1 (patch)
tree7f53eef6fd5c4af1a713070e1c95d38fc9a9d6a3
parentbab69c3fe2c3d9687589221e03722e8f1282e16b (diff)
vendorcode/eltan/security: Use config VENDORCODE_ELTAN_XXX
To avoid confusion use VENDORCODE_ELTAN_VBOOT and VENDORCODE_ELTAN_MBOOT config values. Include verfied_boot and mboot subdirectories as CPPFLAGS when measured boot or verified boot is enabled. This allows to generate binary with measured boot enabled only. BUG=N/A TEST=Boot Linux 4.20 and verify logging on Facebook FBG-1701 Change-Id: Iaaf3c8cacbc8d2be7387264ca9c973e583871f0a Signed-off-by: Frans Hendriks <fhendriks@eltan.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/33442 Reviewed-by: Lance Zhao <lance.zhao@gmail.com> Reviewed-by: Martin Roth <martinroth@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/vendorcode/eltan/security/Makefile.inc7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/vendorcode/eltan/security/Makefile.inc b/src/vendorcode/eltan/security/Makefile.inc
index 26b324ba58..16f17fddd7 100644
--- a/src/vendorcode/eltan/security/Makefile.inc
+++ b/src/vendorcode/eltan/security/Makefile.inc
@@ -1,6 +1,6 @@
## This file is part of the coreboot project.
##
-## Copyright (C) 2018 Eltan B.V.
+## Copyright (C) 2018-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
@@ -16,12 +16,9 @@ subdirs-y += lib
subdirs-y += verified_boot
subdirs-y += mboot
-ifeq ($(CONFIG_MBOOT), y)
+ifneq ($(filter y,$(CONFIG_VENDORCODE_ELTAN_VBOOT) $(CONFIG_VENDORCODE_ELTAN_MBOOT)),)
CPPFLAGS_common += -I$(src)/vendorcode/eltan/security/mboot
CPPFLAGS_common += -I$(src)/vendorcode/eltan/security/include
-endif
-
-ifeq ($(CONFIG_VERIFIED_BOOT), y)
CPPFLAGS_common += -I$(src)/vendorcode/eltan/security/verified_boot
endif