From 9554b26f9fd608cc613fc3ad869db33ef0edfe5c Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Tue, 5 Jun 2018 15:12:56 +0200 Subject: vboot: Fix linking error with USE_OPTION_TABLE enabled Fix a linking problem with VBOOT and USE_OPTION_TABLE enabled. Make use of cbfs_locate_file_in_region() and always search the cmos_layout.bin in the 'COREBOOT' region. With this change applied there's no need to include the vboot_locator in SMM any more, we can't break NVRAM with different CMOS layouts, and we keep VBOOT and non VBOOT behaviour the same. Only include cmos_layout.bin and cmos.default in RO region. Add notes explaining the decisions. Tested on Intel Sandybridge, builds and boots with vboot enabled. Change-Id: I10ae94d7936581bbb5ea49384122062bd4934ea5 Signed-off-by: Patrick Rudolph Reviewed-on: https://review.coreboot.org/26863 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/security/vboot/Makefile.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/security/vboot') diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc index 6f18a35de5..75c2a9e44c 100644 --- a/src/security/vboot/Makefile.inc +++ b/src/security/vboot/Makefile.inc @@ -154,6 +154,8 @@ regions-for-file = $(subst $(spc),$(comma),$(sort \ font.bin \ vbgfx.bin \ rmu.bin \ + cmos_layout.bin \ + cmos.default \ $(call strip_quotes,$(CONFIG_RO_REGION_ONLY)) \ ,$(1)),COREBOOT,COREBOOT FW_MAIN_A FW_MAIN_B))) -- cgit v1.2.3