summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorVadim Bendebury <vbendeb@chromium.org>2011-08-31 13:09:54 -0700
committerVadim Bendebury <vbendeb@chromium.org>2011-08-31 15:26:17 -0700
commit931058bc52abea0caeec59f4b00c742d45986056 (patch)
treeeac1c43a76488107bd8dbd3a394a692d83760b48 /lib
parent7171d851d96d84e7b7374f5c29917165d731a3f8 (diff)
Fix refactoring problems introduced earlier.
It was noticed that the system fails to come up while running the latest u-boot from the 2011.06 branch. Further investigation has discovered that the problem is due to the fact that the initialization of the verified boot wrapper was not handled properly and that the IDE index reported by the IDE discovery routine was wrong. BUG=chromium-os:19599 TEST=manual . build and install the new firmware image on an Alex with a valid ChromeOS image . restart the machine . enter vboot_two at u-boot prompt observe the machine to bring up the ChromeOs login screen. Change-Id: Icc78d682d5c81d6f08d31896c32c8cd48d0a4f2d Signed-off-by: Vadim Bendebury <vbendeb@chromium.org> Reviewed-on: http://gerrit.chromium.org/gerrit/7030 Reviewed-by: Gabe Black (Do Not Use) <gabeblack@google.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/vbexport/boot_device_ide.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/vbexport/boot_device_ide.c b/lib/vbexport/boot_device_ide.c
index a7b496ca53..7e8ee922b4 100644
--- a/lib/vbexport/boot_device_ide.c
+++ b/lib/vbexport/boot_device_ide.c
@@ -31,9 +31,9 @@ static int boot_device_ide_scan(block_dev_desc_t **desc, int max_devs,
ide = ide_get_dev(index);
if (!ide)
- break;
+ continue;
- desc[index++] = ide;
+ desc[found++] = ide;
}
return found;
}