scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-11-26 19:25:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "vboot: Plumb the two disk sizes and 'gpt on device' param through"

Browse Source 
This reverts commit 5040a945df.

This patch breaks booting any image (both fixed and
removable) on Veyron_Pinky (and presumably every other
non-NAND board?). By the power vested in me through the
office of ChromeOS tree sheriff (well, five hours early
but whatever) it is hereby reverted!

BUG=chromium:425677
BRANCH=none
TEST=Can successfully boot on Veyron_Pinky again.

Change-Id: I9323a3d5e34491337fc7eb09dd00d845ac42997d
Reviewed-on: https://chromium-review.googlesource.com/229963
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Julius Werner <jwerner@chromium.org>
Tested-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
Julius Werner
2014-11-15 03:02:29 +00:00
committed by chrome-internal-fetch
parent 5040a945df
commit 79a9e0e63f
8 changed files with 15 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/lib/vboot_kernel.c
View File

@@ -116,9 +116,9 @@ VbError_t LoadKernel(LoadKernelParams *params, VbCommonParams *cparams)
/* Read GPT data */
gpt.sector_bytes = (uint32_t)blba;
gpt.drive_sectors = params->ending_lba + 1;
gpt.gpt_drive_sectors = params->gpt_lba_count;
gpt.stored_on_device = params->external_gpt ? GPT_STORED_OFF_DEVICE
: GPT_STORED_ON_DEVICE;
/* TODO: Set stored_on_device and gpt_drive_sectors appropriately */
gpt.stored_on_device = GPT_STORED_ON_DEVICE;
gpt.gpt_drive_sectors = gpt.drive_sectors;
if (0 != AllocAndReadGptData(params->disk_handle, &gpt)) {
VBDEBUG(("Unable to read GPT data\n"));
shcall->check_result = VBSD_LKC_CHECK_GPT_READ_ERROR;