diff options
| author | Randall Spangler <rspangler@chromium.org> | 2011-07-26 13:14:38 -0700 |
|---|---|---|
| committer | Randall Spangler <rspangler@chromium.org> | 2011-07-26 13:32:49 -0700 |
| commit | 57e91f713f7e647e79ecdf7a6de878f638661e05 (patch) | |
| tree | 85126aad3373bd3c541aae56a3ac146a1ec0fddd /firmware/lib/vboot_kernel.c | |
| parent | ff3f0006447330228f43ad2da5ec55e1f003f870 (diff) | |
| download | vboot-57e91f713f7e647e79ecdf7a6de878f638661e05.tar.gz | |
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>
Diffstat (limited to 'firmware/lib/vboot_kernel.c')
| -rw-r--r-- | firmware/lib/vboot_kernel.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/firmware/lib/vboot_kernel.c b/firmware/lib/vboot_kernel.c index 64c5cc58..6f8029a9 100644 --- a/firmware/lib/vboot_kernel.c +++ b/firmware/lib/vboot_kernel.c @@ -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; |