diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2019-11-18 11:25:47 +0800 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2019-11-19 15:29:20 +0000 |
| commit | 29c8fa4769de86ba0b5f7a8791124121ff7dbe74 (patch) | |
| tree | 23ea26d550aff438784f5517ff9828802701d6dc | |
| parent | ab8edda14a622ab46bdfd01b877d75c7bd385a4d (diff) | |
| download | coreboot-29c8fa4769de86ba0b5f7a8791124121ff7dbe74.tar.xz | |
security/vboot: Remove vboot_named_region_device(_rw)
Remove vboot_named_region_device(_rw) and use
fmap_locate_area_as_rdev(_rw) directly.
BRANCH=none
BUG=none
TEST=emerge-kukui coreboot
Change-Id: I244ac4e01ae5b80285162b3baffc0b30aa057bfb
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36922
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
| -rw-r--r-- | src/security/vboot/vbnv_flash.c | 3 | ||||
| -rw-r--r-- | src/security/vboot/vboot_common.c | 10 | ||||
| -rw-r--r-- | src/security/vboot/vboot_common.h | 6 | ||||
| -rw-r--r-- | src/security/vboot/vboot_logic.c | 5 |
4 files changed, 5 insertions, 19 deletions
diff --git a/src/security/vboot/vbnv_flash.c b/src/security/vboot/vbnv_flash.c index 908846fe70..86c43cd302 100644 --- a/src/security/vboot/vbnv_flash.c +++ b/src/security/vboot/vbnv_flash.c @@ -16,6 +16,7 @@ #include <arch/early_variables.h> #include <commonlib/region.h> #include <console/console.h> +#include <fmap.h> #include <string.h> #include <vb2_api.h> #include <security/vboot/vboot_common.h> @@ -67,7 +68,7 @@ static int init_vbnv(void) int offset; int i; - if (vboot_named_region_device_rw("RW_NVRAM", rdev) || + if (fmap_locate_area_as_rdev_rw("RW_NVRAM", rdev) || region_device_sz(rdev) < BLOB_SIZE) { printk(BIOS_ERR, "%s: failed to locate NVRAM\n", __func__); return 1; diff --git a/src/security/vboot/vboot_common.c b/src/security/vboot/vboot_common.c index 2d35c6be05..a24b220a9c 100644 --- a/src/security/vboot/vboot_common.c +++ b/src/security/vboot/vboot_common.c @@ -24,16 +24,6 @@ #include <security/vboot/vbnv.h> #include <vb2_api.h> -int vboot_named_region_device(const char *name, struct region_device *rdev) -{ - return fmap_locate_area_as_rdev(name, rdev); -} - -int vboot_named_region_device_rw(const char *name, struct region_device *rdev) -{ - return fmap_locate_area_as_rdev_rw(name, rdev); -} - /* Check if it is okay to enable USB Device Controller (UDC). */ int vboot_can_enable_udc(void) { diff --git a/src/security/vboot/vboot_common.h b/src/security/vboot/vboot_common.h index 42b4a6b59b..a20ab62bd4 100644 --- a/src/security/vboot/vboot_common.h +++ b/src/security/vboot/vboot_common.h @@ -20,12 +20,6 @@ #include <vboot_api.h> #include <vboot_struct.h> -/* Locate vboot area by name. Returns 0 on success and -1 on error. */ -int vboot_named_region_device(const char *name, struct region_device *rdev); - -/* Like vboot_named_region_device() but provides a RW region device. */ -int vboot_named_region_device_rw(const char *name, struct region_device *rdev); - /* * Function to check if there is a request to enter recovery mode. Returns * reason code if request to enter recovery mode is present, otherwise 0. diff --git a/src/security/vboot/vboot_logic.c b/src/security/vboot/vboot_logic.c index 5facd283ee..71371cdb75 100644 --- a/src/security/vboot/vboot_logic.c +++ b/src/security/vboot/vboot_logic.c @@ -19,6 +19,7 @@ #include <cbmem.h> #include <console/console.h> #include <console/vtxprintf.h> +#include <fmap.h> #include <string.h> #include <timestamp.h> #include <vb2_api.h> @@ -78,7 +79,7 @@ vb2_error_t vb2ex_read_resource(struct vb2_context *ctx, return VB2_ERROR_EX_READ_RESOURCE_INDEX; } - if (vboot_named_region_device(name, &rdev)) + if (fmap_locate_area_as_rdev(name, &rdev)) return VB2_ERROR_EX_READ_RESOURCE_SIZE; if (rdev_readat(&rdev, buf, offset, size) != size) @@ -265,7 +266,7 @@ static int locate_firmware(struct vb2_context *ctx, else name = "FW_MAIN_B"; - return vboot_named_region_device(name, fw_main); + return fmap_locate_area_as_rdev(name, fw_main); } /** |