diff options
| author | Vadim Bendebury <vbendeb@chromium.org> | 2011-08-31 13:09:54 -0700 |
|---|---|---|
| committer | Vadim Bendebury <vbendeb@chromium.org> | 2011-08-31 15:26:17 -0700 |
| commit | 931058bc52abea0caeec59f4b00c742d45986056 (patch) | |
| tree | eac1c43a76488107bd8dbd3a394a692d83760b48 | |
| parent | 7171d851d96d84e7b7374f5c29917165d731a3f8 (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>
| -rw-r--r-- | board/chromebook-x86/coreboot/coreboot.c | 3 | ||||
| -rw-r--r-- | lib/vbexport/boot_device_ide.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/board/chromebook-x86/coreboot/coreboot.c b/board/chromebook-x86/coreboot/coreboot.c index aee296dc03..c2ae6d2d00 100644 --- a/board/chromebook-x86/coreboot/coreboot.c +++ b/board/chromebook-x86/coreboot/coreboot.c @@ -32,6 +32,7 @@ #include <asm/ic/coreboot/tables.h> #include <asm/ic/coreboot/sysinfo.h> #include <chromeos/power_management.h> +#include <chromeos/common.h> #ifdef CONFIG_HW_WATCHDOG #include <watchdog.h> @@ -63,7 +64,7 @@ int board_early_init_f(void) int board_early_init_r(void) { - return 0; + return vbexport_init(); } void show_boot_progress(int val) 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; } |