diff options
| author | Dan Ehrenberg <dehrenberg@chromium.org> | 2015-01-05 13:05:58 -0800 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-01-06 01:18:56 +0000 |
| commit | f47eccf65b05ebab7f3f24c14a09aceb442e08fc (patch) | |
| tree | 0520397e0205a1215f0ee5042f04470abafeb657 | |
| parent | f3f7fca07fbcb6bb9655a71257f09c71b0a1458d (diff) | |
| download | vboot-factory-samus-6658.B.tar.gz | |
nand: Allow smaller disks for booting a kernelfactory-samus-6658.B
When vboot eliminates trivially small disks, it checks the GPT size for
external GPT disks. For upcoming NAND devices, the GPT size is 8kB. This
patch changes the definition of trivially small disks to be those under
8kB so that NAND can be booted from.
BUG=chromium:433433
TEST=make runalltests
TEST=Booted and saw a kernel from NAND selected on from an 8kB GPT.
BRANCH=none
Change-Id: I5047b9b642d564d5e4d77dd0b6dafb9eea09176a
Signed-off-by: Dan Ehrenberg <dehrenberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/238463
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | firmware/lib/vboot_api_kernel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/lib/vboot_api_kernel.c b/firmware/lib/vboot_api_kernel.c index 784751ad..d394d5cc 100644 --- a/firmware/lib/vboot_api_kernel.c +++ b/firmware/lib/vboot_api_kernel.c @@ -104,7 +104,7 @@ uint32_t VbTryLoadKernel(VbCommonParams *cparams, LoadKernelParams *p, * asked for. */ if (512 != disk_info[i].bytes_per_lba || - 32 > disk_info[i].lba_count || + 16 > disk_info[i].lba_count || get_info_flags != (disk_info[i].flags & ~VB_DISK_FLAG_EXTERNAL_GPT)) { VBDEBUG((" skipping: bytes_per_lba=%" PRIu64 " lba_count=%" PRIu64 " flags=0x%x\n", |