diff options
| author | Randall Spangler <rspangler@chromium.org> | 2018-01-04 16:08:47 -0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2018-01-09 14:14:17 -0800 |
| commit | 98616d79c6b60c719bc3e37f7f82028e77983d94 (patch) | |
| tree | 3f060169830ac25f0c907d2c88052388805b1714 /Makefile | |
| parent | 79c1c6194bc45728a5043443d80506fa1d35c83b (diff) | |
| download | vboot-98616d79c6b60c719bc3e37f7f82028e77983d94.tar.gz | |
firmware: Prune down old region API
The region API was a way for firmware and kernel verification to get
at various blocks of caller-provided data. In practice, we only used
it internally as a way to get at parts of the GBB. Prune it down to
access only the bits of GBB we still need, from the buffer we already
know we have.
In the long run we should use the same vb2ex_read_resource() API that
vb2 firmware verification does, but that should be done in a follow-up
CL since it'll need to be coordinated with support in depthcharge.
No change in functionality.
BUG=chromium:611535
BRANCH=none
TEST=make -j runtests; build bob firmware and boot it
Change-Id: I5715cb8d88274164a1a73ed4a56bbd93af46f9bf
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/852798
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 19 |
1 files changed, 4 insertions, 15 deletions
@@ -318,12 +318,11 @@ BDBLIB = ${BUILD}/bdb.a # Firmware library sources needed by VbInit() call VBINIT_SRCS = \ firmware/lib/vboot_common_init.c \ - firmware/lib/region-init.c \ + firmware/lib/region-init.c # Additional firmware library sources needed by VbSelectFirmware() call VBSF_SRCS = \ - firmware/lib/vboot_common.c \ - firmware/lib/region-fw.c \ + firmware/lib/vboot_common.c # Additional firmware library sources needed by VbSelectAndLoadKernel() call VBSLK_SRCS = \ @@ -339,8 +338,7 @@ VBSLK_SRCS = \ firmware/lib/vboot_display.c \ firmware/lib/vboot_kernel.c \ firmware/lib/vboot_ui.c \ - firmware/lib/vboot_ui_menu.c \ - firmware/lib/region-kernel.c \ + firmware/lib/vboot_ui_menu.c # Code common to both vboot 2.0 (old structs) and 2.1 (new structs) FWLIB2X_SRCS = \ @@ -410,8 +408,7 @@ ifeq (${FIRMWARE_ARCH},) # TODO: split out other stub funcs too VBINIT_SRCS += \ firmware/stub/tpm_lite_stub.c \ - firmware/stub/vboot_api_stub_init.c \ - firmware/stub/vboot_api_stub_region.c + firmware/stub/vboot_api_stub_init.c VBSLK_SRCS += \ firmware/stub/vboot_api_stub.c \ @@ -747,10 +744,6 @@ TEST_NAMES += \ tests/rollback_index2_tests endif -ifdef REGION_READ -TEST_NAMES += tests/vboot_region_tests -endif - TEST_FUTIL_NAMES = \ tests/futility/binary_editor \ tests/futility/test_file_types \ @@ -910,10 +903,6 @@ ${FWLIB_OBJS}: CFLAGS += -DSAVE_LOCALE_IMMEDIATELY ${FWLIB_OBJS}: CFLAGS += -DCOPY_BMP_DATA endif -ifdef REGION_READ -${FWLIB_OBJS}: CFLAGS += -DREGION_READ -endif - ifeq (${FIRMWARE_ARCH},) # Disable rollback TPM when compiling locally, since otherwise # load_kernel_test attempts to talk to the TPM. |