From a6c5ddd595e145ffd091a9fcadb5e0ffbf0fa8d1 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 22 Jul 2016 06:59:40 -0700 Subject: vboot: Clean up vboot code 1. Remove unused functions/structures. 2. Add checks for NULL return values. 3. Change prefixes to vb2 instead of vboot for functions used internally within vboot2/ 4. Get rid of vboot_handoff.h file and move the structure definition to vboot_common.h 5. Rename all functions using handoff structure to have prefix vboot_handoff_*. All the handoff functions can be run _only_ after cbmem is online. 6. Organize vboot_common.h content according to different functionalities. BUG=chrome-os-partner:55431 Change-Id: I4c07d50327d88cddbdfbb0b6f82c264e2b8620eb Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/15799 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) --- src/vendorcode/google/chromeos/vboot2/common.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/vendorcode/google/chromeos/vboot2/common.c') diff --git a/src/vendorcode/google/chromeos/vboot2/common.c b/src/vendorcode/google/chromeos/vboot2/common.c index 749f328a01..58ea95d219 100644 --- a/src/vendorcode/google/chromeos/vboot2/common.c +++ b/src/vendorcode/google/chromeos/vboot2/common.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include #include #include #include @@ -21,7 +22,7 @@ #include #include "../chromeos.h" #include "../symbols.h" -#include "../vboot_handoff.h" +#include "../vboot_common.h" #include "misc.h" struct selected_region { @@ -134,19 +135,20 @@ int vb2_get_selected_region(struct region *region) void vb2_set_selected_region(const struct region *region) { struct selected_region *reg = vb2_selected_region(); + + assert(reg != NULL); + reg->offset = region_offset(region); reg->size = region_sz(region); } -int vboot_is_slot_selected(void) +int vb2_is_slot_selected(void) { const struct selected_region *reg = vb2_selected_region(); - return reg->size > 0; -} -int vboot_is_readonly_path(void) -{ - return !vboot_is_slot_selected(); + assert(reg != NULL); + + return reg->size > 0; } void vb2_store_selected_region(void) @@ -160,6 +162,8 @@ void vb2_store_selected_region(void) sel_reg = cbmem_add(CBMEM_ID_VBOOT_SEL_REG, sizeof(*sel_reg)); + assert(sel_reg != NULL); + sel_reg->offset = wd->selected_region.offset; sel_reg->size = wd->selected_region.size; } -- cgit v1.2.3