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

Unified Diff: firmware/lib/vboot_kernel.c

Issue 6670040: Fix LoadKernel() not returning LOAD_KERNEL_RECOVERY (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/vboot_reference.git@master
Patch Set: Created 9 years, 9 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 | no next file » | 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 84f6615c946f29015b79b18b23c084f64aab58c8..83fb3fed31c61643d96756d0aafac27343d30a9c 100644
--- a/firmware/lib/vboot_kernel.c
+++ b/firmware/lib/vboot_kernel.c
@@ -139,10 +139,7 @@ int LoadKernel(LoadKernelParams* params) {
uint32_t test_err = 0;
uint32_t status;
- /* TODO: differentiate between finding an invalid kernel (found_partitions>0)
- * and not finding one at all. Right now we treat them the same, and return
- * LOAD_KERNEL_INVALID for both. */
- int retval = LOAD_KERNEL_INVALID;
+ int retval = LOAD_KERNEL_RECOVERY;
int recovery = VBNV_RECOVERY_RO_UNSPECIFIED;
/* Setup NV storage */
@@ -542,6 +539,11 @@ int LoadKernel(LoadKernelParams* params) {
/* Success! */
retval = LOAD_KERNEL_SUCCESS;
+ } else {
+ /* TODO: differentiate between finding an invalid kernel
+ * (found_partitions>0) and not finding one at all. Right now we
+ * treat them the same, and return LOAD_KERNEL_INVALID for both. */
+ retval = LOAD_KERNEL_INVALID;
}
LoadKernelExit:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698