From f69cece074f2b82c64e04735bcb0c75be8a0e7bb Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Tue, 4 May 2021 08:15:22 +0200 Subject: [PATCH] 3rdparty/intel-sec-tools: Update submodule pointer 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/52971 Reviewed-by: Christian Walter Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- 3rdparty/intel-sec-tools | 2 +- src/security/intel/cbnt/Makefile.inc | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/3rdparty/intel-sec-tools b/3rdparty/intel-sec-tools index 2b028cc0e3..875763e421 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 93c2aff0f2..c20a3dddcd 100644 --- a/src/security/intel/cbnt/Makefile.inc +++ b/src/security/intel/cbnt/Makefile.inc @@ -28,7 +28,7 @@ $(CBNT_PROV): 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 @@ $(obj)/bpm_unsigned.bin: $(obj)/coreboot.rom $(CBNT_PROV) --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)) \