Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/coreboot/+/39272 )
Change subject: security/vboot: Support enabling EC EFS with EC software sync ......................................................................
security/vboot: Support enabling EC EFS with EC software sync
If the ChromeOS EC uses EC early firmware selection (EFS), the AP vboot build must also enable EC EFS. Add an option to control this, passing it through to vboot.
BUG=b:150742950 TEST=none BRANCH=none
Signed-off-by: Sam McNally sammc@chromium.org Change-Id: I697e90748e19d15af154011413b30c0f2a0bf52e Reviewed-on: https://review.coreboot.org/c/coreboot/+/39272 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Edward O'Callaghan quasisec@chromium.org Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net Reviewed-by: Tim Wawrzynczak twawrzynczak@chromium.org --- M src/security/vboot/Kconfig M src/security/vboot/Makefile.inc 2 files changed, 9 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Paul Menzel: Looks good to me, but someone else must approve Tim Wawrzynczak: Looks good to me, approved Edward O'Callaghan: Looks good to me, approved
diff --git a/src/security/vboot/Kconfig b/src/security/vboot/Kconfig index e366cc4..b6bf542 100644 --- a/src/security/vboot/Kconfig +++ b/src/security/vboot/Kconfig @@ -260,6 +260,14 @@ significantly impact boot time, as this operation will be performed later in the boot flow if it is disabled here.
+config VBOOT_EC_EFS + bool "Early firmware selection (EFS) EC" + default n + help + CrosEC can support EFS: Early Firmware Selection. If it's enabled, + software sync needs to also support it. This setting tells vboot to + perform EFS software sync. + menu "GBB configuration"
config GBB_HWID diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc index 138273f..d0d3370 100644 --- a/src/security/vboot/Makefile.inc +++ b/src/security/vboot/Makefile.inc @@ -41,6 +41,7 @@ +FIRMWARE_ARCH=$$(ARCHDIR-$$(ARCH-$(1)-y)) \ CC="$$(CC_$(1))" \ CFLAGS="$$(VBOOT_CFLAGS_$(1))" VBOOT2="y" \ + EC_EFS="$(CONFIG_VBOOT_EC_EFS)" \ $(MAKE) -C $(VBOOT_SOURCE) \ BUILD=$$(abspath $$(dir $$(VBOOT_LIB_$(1)))) \ V=$(V) \