Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/52971 )
Change subject: UPDATE 3rdparty/intel-sec-tools ......................................................................
UPDATE 3rdparty/intel-sec-tools
Some changes: - bg-prov got renamed to cbnt-prov - cbfs support was added which means that providing IBB.Base/Size separatly is not required anymore. Also fspt.bin gets added as an IBB to secure the root of trust.
Change-Id: I20379e9723fa18e0ebfb0622c050524d4e6d2717 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M 3rdparty/intel-sec-tools M src/security/intel/cbnt/Makefile.inc 2 files changed, 4 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/52971/1
diff --git a/3rdparty/intel-sec-tools b/3rdparty/intel-sec-tools index 2b028cc..875763e 160000 --- a/3rdparty/intel-sec-tools +++ b/3rdparty/intel-sec-tools @@ -1 +1 @@ -Subproject commit 2b028cc0e3cdaf1aa3110b6367eb232e9ec9d9c8 +Subproject commit 875763e421ed3a76ec0e0f51c4ed93c6a0038771 diff --git a/src/security/intel/cbnt/Makefile.inc b/src/security/intel/cbnt/Makefile.inc index 93c2aff..c20a3dd 100644 --- a/src/security/intel/cbnt/Makefile.inc +++ b/src/security/intel/cbnt/Makefile.inc @@ -28,7 +28,7 @@ cd 3rdparty/intel-sec-tools; \ GO111MODULE=on go mod download; \ GO111MODULE=on go mod verify; \ - GO111MODULE=on go build -o $(top)/$@ cmd/bg-prov/*.go + GO111MODULE=on go build -o $(top)/$@ cmd/cbnt-prov/*.go
$(CBNT_CFG): $(call strip_quotes, $(CONFIG_INTEL_CBNT_CBNT_PROV_CFG_FILE)) cp $(CONFIG_INTEL_CBNT_CBNT_PROV_CFG_FILE) $@ @@ -50,10 +50,8 @@ --ibbflags=$(CONFIG_INTEL_CBNT_IBB_FLAGS) \ --entrypoint=$(shell printf "%d" 0xfffffff0) \ --ibbhash=11,4,12 \ - --ibbsegbase=$(call int-add, $(call int-subtract, 0xffffffff $(CONFIG_C_ENV_BOOTBLOCK_SIZE)) 1) \ - --ibbsegsize=$(shell printf "%d" $(CONFIG_C_ENV_BOOTBLOCK_SIZE)) \ - --ibbsegflag=0 \ - --sintmin=$(CONFIG_INTEL_CBNT_SINIT_SVN) \ + --coreboot \ + --sinitmin=$(CONFIG_INTEL_CBNT_SINIT_SVN) \ --txtflags=0 \ --powerdowninterval=$(CONFIG_INTEL_CBNT_PD_INTERVAL) \ --acpibaseoffset=$(shell printf "%d" $(CONFIG_INTEL_ACPI_BASE_ADDRESS)) \