Arthur Heymans has submitted this change. ( https://review.coreboot.org/c/coreboot/+/51982 )
Change subject: security/intel/cbnt: Allow to use an externally provided cbnt-prov bin
......................................................................
security/intel/cbnt: Allow to use an externally provided cbnt-prov bin
Building the cbnt-prov tool requires godeps which does not work if
offline. Therefore, add an option to provide this binary via Kconfig.
It's the responsibility of the user to use a compatible binary then.
Change-Id: I06ff4ee01bf58cae45648ddb8a30a30b9a7e027a
Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51982
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Angel Pons <th3fanbus(a)gmail.com>
---
M src/security/intel/cbnt/Kconfig
M src/security/intel/cbnt/Makefile.inc
2 files changed, 19 insertions(+), 0 deletions(-)
Approvals:
build bot (Jenkins): Verified
Angel Pons: Looks good to me, approved
diff --git a/src/security/intel/cbnt/Kconfig b/src/security/intel/cbnt/Kconfig
index a602cca..9d48490 100644
--- a/src/security/intel/cbnt/Kconfig
+++ b/src/security/intel/cbnt/Kconfig
@@ -87,6 +87,20 @@
Or extract it from a working configuration:
$ bg-prov read-config
+config INTEL_CBNT_PROV_EXTERNAL_BIN
+ bool "Use an external cbnt-prov binary"
+ default n
+ depends on INTEL_CBNT_GENERATE_BPM || INTEL_CBNT_GENERATE_KM
+ help
+ Building cbnt-prov requires godeps which makes it impossible to build
+ it in an offline environment. A solution is to use an external binary.
+
+config INTEL_CBNT_PROV_EXTERNAL_BIN_PATH
+ string "cbnt-prov path"
+ depends on INTEL_CBNT_PROV_EXTERNAL_BIN
+ help
+ Path to the cbnt-prov binary.
+
config INTEL_CBNT_NEED_KM_PUB_KEY
bool
diff --git a/src/security/intel/cbnt/Makefile.inc b/src/security/intel/cbnt/Makefile.inc
index b0ff9be..9b00d7d 100644
--- a/src/security/intel/cbnt/Makefile.inc
+++ b/src/security/intel/cbnt/Makefile.inc
@@ -29,12 +29,17 @@
CBNT_PROV:=$(obj)/cbnt-prov
CBNT_CFG:=$(obj)/cbnt.json
+ifneq ($(CONFIG_INTEL_CBNT_PROV_EXTERNAL_BIN),y)
$(CBNT_PROV):
printf " CBNT_PROV building tool\n"
cd 3rdparty/intel-sec-tools; \
GO111MODULE=on go mod download; \
GO111MODULE=on go mod verify; \
GO111MODULE=on go build -o $(top)/$@ cmd/cbnt-prov/*.go
+else
+$(CBNT_PROV): $(call strip_quotes, $(CONFIG_INTEL_CBNT_PROV_EXTERNAL_BIN_PATH))
+ cp $< $@
+endif
$(CBNT_CFG): $(call strip_quotes, $(CONFIG_INTEL_CBNT_CBNT_PROV_CFG_FILE))
cp $(CONFIG_INTEL_CBNT_CBNT_PROV_CFG_FILE) $@
--
To view, visit https://review.coreboot.org/c/coreboot/+/51982
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I06ff4ee01bf58cae45648ddb8a30a30b9a7e027a
Gerrit-Change-Number: 51982
Gerrit-PatchSet: 9
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-MessageType: merged
Attention is currently required from: Martin Roth, Arthur Heymans.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/51982 )
Change subject: security/intel/cbnt: Allow to use an externally provided cbnt-prov bin
......................................................................
Patch Set 8: Code-Review+2
(1 comment)
File src/security/intel/cbnt/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/51982/comment/868c0ebc_d98390db
PS8, Line 41: $@
> > Should this be `$(top)/$@` ? […]
Ack
--
To view, visit https://review.coreboot.org/c/coreboot/+/51982
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I06ff4ee01bf58cae45648ddb8a30a30b9a7e027a
Gerrit-Change-Number: 51982
Gerrit-PatchSet: 8
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Attention: Martin Roth <martinroth(a)google.com>
Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Comment-Date: Tue, 11 May 2021 08:29:39 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com>
Comment-In-Reply-To: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-MessageType: comment
Attention is currently required from: Martin Roth, Angel Pons.
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/51982 )
Change subject: security/intel/cbnt: Allow to use an externally provided cbnt-prov bin
......................................................................
Patch Set 8:
(1 comment)
File src/security/intel/cbnt/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/51982/comment/fa1fe5b5_4c4ced08
PS8, Line 41: $@
> Should this be `$(top)/$@` ?
This is only needed in the previous lines because a 'cd' is issued.
--
To view, visit https://review.coreboot.org/c/coreboot/+/51982
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I06ff4ee01bf58cae45648ddb8a30a30b9a7e027a
Gerrit-Change-Number: 51982
Gerrit-PatchSet: 8
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Attention: Martin Roth <martinroth(a)google.com>
Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Comment-Date: Tue, 11 May 2021 08:29:01 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-MessageType: comment
Attention is currently required from: Martin Roth, Christian Walter, Arthur Heymans.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/51975 )
Change subject: security/intel/cbnt/Makefile.inc: Use variables for hash alg
......................................................................
Patch Set 5: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/51975
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I4113b1496e99c10017fc1d85a4acbbc16d32ea41
Gerrit-Change-Number: 51975
Gerrit-PatchSet: 5
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Attention: Martin Roth <martinroth(a)google.com>
Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Comment-Date: Tue, 11 May 2021 08:23:06 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Martin Roth, Arthur Heymans.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/51982 )
Change subject: security/intel/cbnt: Allow to use an externally provided cbnt-prov bin
......................................................................
Patch Set 8: Code-Review+1
(1 comment)
File src/security/intel/cbnt/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/51982/comment/19e09ba1_442352b6
PS8, Line 41: $@
Should this be `$(top)/$@` ?
--
To view, visit https://review.coreboot.org/c/coreboot/+/51982
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I06ff4ee01bf58cae45648ddb8a30a30b9a7e027a
Gerrit-Change-Number: 51982
Gerrit-PatchSet: 8
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org>
Gerrit-Attention: Martin Roth <martinroth(a)google.com>
Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Comment-Date: Tue, 11 May 2021 08:22:30 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Ian Feng.
Vitaly Rodionov has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/53901 )
Change subject: mb/google/octopus/var/fleex: Add cs42l42 HSBIAS setting
......................................................................
Patch Set 3: Code-Review+1
This change is ready for review.
--
To view, visit https://review.coreboot.org/c/coreboot/+/53901
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I12c0e0a0f7490d35d36fe8ccbc940f29e1bb7976
Gerrit-Change-Number: 53901
Gerrit-PatchSet: 3
Gerrit-Owner: Ian Feng <ian_feng(a)compal.corp-partner.google.com>
Gerrit-Reviewer: Henry Sun <henrysun(a)google.com>
Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com>
Gerrit-Reviewer: Marco Chen <marcochen(a)google.com>
Gerrit-Reviewer: Vitaly Rodionov <vitaly.rodionov(a)cirrus.corp-partner.google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Alan Lee <alan_lee(a)compal.corp-partner.google.com>
Gerrit-CC: EricR Lai <ericr_lai(a)compal.corp-partner.google.com>
Gerrit-Attention: Ian Feng <ian_feng(a)compal.corp-partner.google.com>
Gerrit-Comment-Date: Tue, 11 May 2021 08:17:43 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment