From 98dfade54684f1141f129d1af93dfd6e0e8c6455 Mon Sep 17 00:00:00 2001 From: Joel Kitching Date: Tue, 18 Jun 2019 13:59:28 +0800 Subject: [PATCH] vboot: remove VbCommonParams struct VbCommonParams is now a relic of the past. It was originally used to pass data to VbInit, VbSelectFirmware, VbSelectAndLoadKernel, and VbVerifyMemoryBootImage. The former two are long deprecated and removed, while the latter two now pass information via the vb2_context struct. BUG=b:124141368, b:124192753 TEST=make clean && make runtests BRANCH=none Change-Id: Ie72f1a5308dea4f9abf2738f104cf373d1030623 Signed-off-by: Joel Kitching Cq-Depend: chromium:1663749 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1663893 Tested-by: Joel Kitching Commit-Queue: Joel Kitching Auto-Submit: Joel Kitching Reviewed-by: Julius Werner --- firmware/include/vboot_api.h | 38 ---------------------------------- firmware/lib/include/ec_sync.h | 1 - 2 files changed, 39 deletions(-) diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index ef5ca278..70eaad17 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -167,44 +167,6 @@ enum VbErrorPredefined_t { #define VB_SHARED_DATA_MIN_SIZE 3072 #define VB_SHARED_DATA_REC_SIZE 16384 -/* - * Data passed by firmware to VbInit(), VbSelectFirmware() and - * VbSelectAndLoadKernel(). - * - * Note that in UEFI, these are called by different phases in different - * processor modes (VbInit() and VbSelectFirmware() = 32-bit PEI, - * VbSelectAndLoadKernel() = 64-bit BDS), so the data may be at a different - * location between calls. - */ -typedef struct VbCommonParams { - /* Pointer to GBB data */ - void *gbb_data; - /* Size of GBB data in bytes */ - uint32_t gbb_size; - - /* - * Shared data blob for data shared between verified boot entry points. - * This should be at least VB_SHARED_DATA_MIN_SIZE bytes long, and - * ideally is VB_SHARED_DATA_REC_SIZE bytes long. - */ - /* Pointer to shared data blob buffer */ - void *shared_data_blob; - /* - * On input, set to size of shared data blob buffer, in bytes. On - * output, this will contain the actual data size placed into the - * buffer. - */ - uint32_t shared_data_size; - - /* - * Internal context/data for verified boot, to maintain state during - * calls to other API functions such as VbExHashFirmwareBody(). - * Allocated and freed inside the entry point; firmware should not look - * at this. - */ - void *vboot_context; -} VbCommonParams; - /* Flags for VbExGetSwitches() */ /* Report if user is currently present (typically via power button) */ #define VB_SWITCH_FLAG_PHYS_PRESENCE_PRESSED 0x00000004 diff --git a/firmware/lib/include/ec_sync.h b/firmware/lib/include/ec_sync.h index dfb8ec9c..303ea2a4 100644 --- a/firmware/lib/include/ec_sync.h +++ b/firmware/lib/include/ec_sync.h @@ -11,7 +11,6 @@ #include "vboot_api.h" struct vb2_context; -struct VbCommonParams; /** * EC sync, phase 1