vboot: rename symbols for better consistency
Symbols prefixed with vb2_ should be reserved for internal vboot library use. Anything outside of that may choose some other prefix. Here, we choose vboot_ instead. Also, add some documentation to security/vboot/misc.h, which provides headers for a number of different C files. BUG=b:124141368 TEST=Build and deploy to eve TEST=util/lint/checkpatch.pl -g origin/master..HEAD TEST=util/abuild/abuild -B -e -y -c 50 -p none -x TEST=make clean && make test-abuild BRANCH=none Change-Id: I5d9154fd2d5df25ee254bd5ce4a173afaa6588be Signed-off-by: Joel Kitching <kitching@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/31886 Reviewed-by: Julius Werner <jwerner@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
committed by
Patrick Georgi
parent
725369fd0c
commit
af8471c2b6
@@ -63,7 +63,7 @@ static int verstage_should_load(void)
|
||||
|
||||
static int vboot_executed CAR_GLOBAL;
|
||||
|
||||
int vb2_logic_executed(void)
|
||||
int vboot_logic_executed(void)
|
||||
{
|
||||
/* If we are in a stage that would load the verstage or execute the
|
||||
vboot logic directly, we store the answer in a global. */
|
||||
@@ -91,7 +91,7 @@ static void vboot_prepare(void)
|
||||
/* Note: this path is not used for VBOOT_RETURN_FROM_VERSTAGE */
|
||||
verstage_main();
|
||||
car_set_var(vboot_executed, 1);
|
||||
vb2_save_recovery_reason_vbnv();
|
||||
vboot_save_recovery_reason_vbnv();
|
||||
} else if (verstage_should_load()) {
|
||||
struct cbfsf file;
|
||||
struct prog verstage =
|
||||
@@ -138,10 +138,10 @@ static int vboot_locate(struct cbfs_props *props)
|
||||
struct region selected_region;
|
||||
|
||||
/* Don't honor vboot results until the vboot logic has run. */
|
||||
if (!vb2_logic_executed())
|
||||
if (!vboot_logic_executed())
|
||||
return -1;
|
||||
|
||||
if (vb2_get_selected_region(&selected_region))
|
||||
if (vboot_get_selected_region(&selected_region))
|
||||
return -1;
|
||||
|
||||
props->offset = region_offset(&selected_region);
|
||||
|
Reference in New Issue
Block a user