diff options
| author | Yoshiki Iguchi <yoshiki@chromium.org> | 2013-08-29 05:10:33 +0000 |
|---|---|---|
| committer | Yoshiki Iguchi <yoshiki@chromium.org> | 2013-08-29 05:36:12 +0000 |
| commit | 8fa13ad6f727d44fdc0ae1d2bde5f54b32dab9b9 (patch) | |
| tree | e7b1cd139b4aaa06d61d2aa30b74c45c2eeaa1f3 /firmware/lib/vboot_api_firmware.c | |
| parent | 1d3c804b6b9d2ffb6953a7ee98fabfd548915ad7 (diff) | |
| download | vboot-8fa13ad6f727d44fdc0ae1d2bde5f54b32dab9b9.tar.gz | |
Revert "Implementation of Region API"
This reverts commit 1d3c804b6b9d2ffb6953a7ee98fabfd548915ad7.
This patch breaks cbuildbot on internal paladins bots.
Change-Id: Icf7f9d9bbb56b092035888eaa3e249ffd23fac16
(cherry picked from commit 3a60335ebb1530e5fd9d5da3bc6214949bc59caf)
Reviewed-on: https://chromium-review.googlesource.com/167451
Reviewed-by: Yoshiki Iguchi <yoshiki@chromium.org>
Commit-Queue: Yoshiki Iguchi <yoshiki@chromium.org>
Tested-by: Yoshiki Iguchi <yoshiki@chromium.org>
Diffstat (limited to 'firmware/lib/vboot_api_firmware.c')
| -rw-r--r-- | firmware/lib/vboot_api_firmware.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/firmware/lib/vboot_api_firmware.c b/firmware/lib/vboot_api_firmware.c index cfe4251c..e0c93a37 100644 --- a/firmware/lib/vboot_api_firmware.c +++ b/firmware/lib/vboot_api_firmware.c @@ -7,7 +7,6 @@ #include "sysincludes.h" -#include "gbb_access.h" #include "gbb_header.h" #include "load_firmware_fw.h" #include "rollback_index.h" @@ -28,9 +27,6 @@ VbError_t VbSelectFirmware(VbCommonParams *cparams, int is_dev = (shared->flags & VBSD_BOOT_DEV_SWITCH_ON ? 1 : 0); uint32_t tpm_status = 0; - cparams->gbb = NULL; - cparams->bmp = NULL; - /* Start timer */ shared->timer_vb_select_firmware_enter = VbExGetTimer(); @@ -48,11 +44,6 @@ VbError_t VbSelectFirmware(VbCommonParams *cparams, /* Go directly to recovery mode */ fparams->selected_firmware = VB_SELECT_FIRMWARE_RECOVERY; } else { - cparams->gbb = VbExMalloc(sizeof(*cparams->gbb)); - retval = VbGbbReadHeader_static(cparams, cparams->gbb); - if (VBERROR_SUCCESS != retval) - goto VbSelectFirmware_exit; - /* Chain to LoadFirmware() */ retval = LoadFirmware(cparams, fparams, &vnc); @@ -116,11 +107,6 @@ VbError_t VbSelectFirmware(VbCommonParams *cparams, VbSelectFirmware_exit: - if (cparams->gbb) { - VbExFree(cparams->gbb); - cparams->gbb = NULL; - } - /* Save NV storage */ VbNvTeardown(&vnc); if (vnc.raw_changed) |