diff options
| author | Julius Werner <jwerner@chromium.org> | 2014-11-15 03:02:29 +0000 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-11-15 05:59:54 +0000 |
| commit | 79a9e0e63fd1001a3f9615f96c09acba5f20250d (patch) | |
| tree | d3743c717ea7f193e4069d91a3a0f18c0426e4db /tests/vboot_kernel_tests.c | |
| parent | 5040a945dfd0dd305d3ca8e923b8bf0bd5c6528e (diff) | |
| download | vboot-79a9e0e63fd1001a3f9615f96c09acba5f20250d.tar.gz | |
Revert "vboot: Plumb the two disk sizes and 'gpt on device' param through"stabilize-6480.Bfactory-ryu-6486.Bfactory-ryu-6486.1.B
This reverts commit 5040a945dfd0dd305d3ca8e923b8bf0bd5c6528e.
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>
Diffstat (limited to 'tests/vboot_kernel_tests.c')
| -rw-r--r-- | tests/vboot_kernel_tests.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/vboot_kernel_tests.c b/tests/vboot_kernel_tests.c index 4866a6d3..c546ed12 100644 --- a/tests/vboot_kernel_tests.c +++ b/tests/vboot_kernel_tests.c @@ -151,7 +151,6 @@ static void ResetMocks(void) lkp.gbb_size = sizeof(gbb_data); lkp.bytes_per_lba = 512; lkp.ending_lba = 1023; - lkp.gpt_lba_count = 1024; lkp.kernel_buffer = kernel_buffer; lkp.kernel_buffer_size = sizeof(kernel_buffer); lkp.disk_handle = (VbExDiskHandle_t)1; @@ -542,11 +541,6 @@ static void InvalidParamsTest(void) TEST_EQ(LoadKernel(&lkp, &cparams), VBERROR_NO_KERNEL_FOUND, "Bad GPT"); - ResetMocks(); - lkp.gpt_lba_count = 0; - TEST_EQ(LoadKernel(&lkp, &cparams), VBERROR_NO_KERNEL_FOUND, - "GPT size = 0"); - /* This causes the stream open call to fail */ ResetMocks(); lkp.disk_handle = NULL; |