mirror of
https://github.com/Telecominfraproject/OpenCellular.git
synced 2025-11-27 03:33:50 +00:00
Move VbNvContext setup/teardown to vboot wrapper funcs
BUG=chromium-os:18226 TEST=make && make runtests Change-Id: Ie22e99a9796866e646ed92158410bc7a2fdf90f6 Reviewed-on: http://gerrit.chromium.org/gerrit/4754 Reviewed-by: Stefan Reinauer <reinauer@google.com> Tested-by: Randall Spangler <rspangler@chromium.org>
This commit is contained in:
@@ -143,9 +143,6 @@ VbError_t LoadKernel(LoadKernelParams* params) {
|
||||
VbError_t retval = VBERROR_UNKNOWN;
|
||||
int recovery = VBNV_RECOVERY_RO_UNSPECIFIED;
|
||||
|
||||
/* Setup NV storage */
|
||||
VbNvSetup(vnc);
|
||||
|
||||
/* Sanity Checks */
|
||||
if (!params ||
|
||||
!params->bytes_per_lba ||
|
||||
@@ -537,10 +534,9 @@ VbError_t LoadKernel(LoadKernelParams* params) {
|
||||
|
||||
LoadKernelExit:
|
||||
|
||||
/* Store recovery request, if any, then tear down non-volatile storage */
|
||||
/* Store recovery request, if any */
|
||||
VbNvSet(vnc, VBNV_RECOVERY_REQUEST, VBERROR_SUCCESS != retval ?
|
||||
recovery : VBNV_RECOVERY_NOT_REQUESTED);
|
||||
VbNvTeardown(vnc);
|
||||
|
||||
shcall->return_code = (uint8_t)retval;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user