Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(667)

Unified Diff: firmware/lib/vboot_kernel.c

Issue 3249009: Always treat invalid images as nonexistant now. (Closed) Base URL: http://git.chromium.org/git/vboot_reference.git
Patch Set: Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | firmware/version.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: firmware/lib/vboot_kernel.c
diff --git a/firmware/lib/vboot_kernel.c b/firmware/lib/vboot_kernel.c
index 93ed4d1ec35ac1775eae963de1283fa133d6c359..7512535ba8dfe83ac2e12f2608ce2b1329fc3481 100644
--- a/firmware/lib/vboot_kernel.c
+++ b/firmware/lib/vboot_kernel.c
@@ -429,9 +429,10 @@ int LoadKernel(LoadKernelParams* params) {
return LOAD_KERNEL_SUCCESS;
}
- // Handle error cases
- if (found_partitions)
- return LOAD_KERNEL_INVALID;
- else
- return LOAD_KERNEL_NOT_FOUND;
+ /* The BIOS may attempt to display different screens depending on whether
+ * we find an invalid kernel partition (return LOAD_KERNEL_INVALID) or not.
+ * But the flow is changing, so for now treating both cases as invalid gives
+ * slightly less confusing user feedback. Sigh.
+ */
+ return LOAD_KERNEL_INVALID;
}
« no previous file with comments | « no previous file | firmware/version.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698