diff options
| author | Bill Richardson <wfrichar@chromium.org> | 2012-08-01 15:02:15 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-08-02 15:36:42 -0700 |
| commit | 2934475dbc6267915ecddd7bb53c922da928a749 (patch) | |
| tree | 39cae403b68254308bf4c02d30cebc05cbeac7a3 /firmware/include/vboot_api.h | |
| parent | 41282f1bbbf3a5dd75055d99194d15aa98b67242 (diff) | |
| download | vboot-2934475dbc6267915ecddd7bb53c922da928a749.tar.gz | |
TONORM screen should display at Dev screen, not Recovery screen.
We're still working out the correct behavior for the keyboard-based
dev-mode. Before this, we rebooted into recovery mode before asking if you
wanted to return to normal mode, so if you said "no, stay in dev-mode" you'd
still be at the recovery screen.
But now the confirmation for returning to normal mode happens at the
dev-mode screen, so you never get to the recovery screen (unless normal mode
won't boot, in which case you get there automatically).
BUG=chrome-os-partner:11707
TEST=manual
First, clear the GBB flags so that you can actually test the virtual dev
switch:
/usr/share/vboot/bin/set_gbb_flags.sh 0
reboot
It should come up in normal mode.
Activate keyboard-based dev-mode as before:
- three-finger salute
- Ctrl-D at the recovery screen
- Press ENTER when asked
Now, at the DEV screen, try to leave:
- Press SPACE. It should ask if you want to go to normal mode.
- Press ESC (no). You should be back at the DEV screen again.
- Press ENTER. It should ask if you want to go to normal mode.
- Press ESC (no). You should be back at the DEV screen again.
- Press SPACE. It should ask if you want to go to normal mode.
- Press ENTER (yes). It should reboot into normal mode.
Change-Id: I99af6e7b97fb61f943bd14c8c7166571b5ccf106
Signed-off-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/28872
Diffstat (limited to 'firmware/include/vboot_api.h')
| -rw-r--r-- | firmware/include/vboot_api.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index 9aa7f0ad..b6748fc8 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -524,7 +524,7 @@ enum VbScreenType_t { VB_SCREEN_RECOVERY_INSERT = 0x202, /* Recovery - insert recovery image */ VB_SCREEN_RECOVERY_NO_GOOD = 0x203, /* Recovery - inserted image invalid */ VB_SCREEN_RECOVERY_TO_DEV = 0x204, /* Recovery - confirm dev mode */ - VB_SCREEN_RECOVERY_TO_NORM = 0x205, /* Recovery - confirm normal mode */ + VB_SCREEN_DEVELOPER_TO_NORM = 0x205, /* Developer - confirm normal mode */ }; /* Initialize and clear the display. Set width and height to the screen |