diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2012-01-03 10:44:42 -0800 |
|---|---|---|
| committer | Stefan Reinauer <reinauer@chromium.org> | 2012-01-03 11:20:59 -0800 |
| commit | f75a6008245d437a663ba22efc05a2d8a58b4c71 (patch) | |
| tree | 81b6e1da3efd3ce99832cc79511856cb39638afc | |
| parent | 9e27318a990f7c89b8bcecef48736589b0417fc5 (diff) | |
| download | vboot-f75a6008245d437a663ba22efc05a2d8a58b4c71.tar.gz | |
Revert "Display debug info on all screens for testing."
No longer needed because the required USB fixes went in.
This reverts commit 01efb52cf1842849d51d6ff177698e75b56ba8f6
Change-Id: If5899dde975f6a6dbe08faac0af7bbbddaf17efc
Reviewed-on: https://gerrit.chromium.org/gerrit/13587
Commit-Ready: Stefan Reinauer <reinauer@chromium.org>
Tested-by: Stefan Reinauer <reinauer@chromium.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
| -rw-r--r-- | firmware/lib/vboot_display.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index 11429306..120f7be6 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -357,18 +357,11 @@ VbError_t VbDisplayScreen(VbCommonParams* cparams, uint32_t screen, int force, disp_current_screen = screen; /* Look in the GBB first */ - if (VBERROR_SUCCESS == VbDisplayScreenFromGBB(cparams, screen, vncptr)) { - if (VB_SCREEN_BLANK != screen) - VbDisplayDebugInfo(cparams, vncptr); + if (VBERROR_SUCCESS == VbDisplayScreenFromGBB(cparams, screen, vncptr)) return VBERROR_SUCCESS; - } /* If the screen wasn't in the GBB bitmaps, fall back to a default screen. */ - retval = VbExDisplayScreen(screen); - if (VB_SCREEN_BLANK != screen) - VbDisplayDebugInfo(cparams, vncptr); - return retval; - + return VbExDisplayScreen(screen); } @@ -487,7 +480,7 @@ VbError_t VbDisplayDebugInfo(VbCommonParams* cparams, VbNvContext *vncptr) { uint32_t i; /* Redisplay the current screen, to overwrite any previous debug output */ - // VbDisplayScreen(cparams, disp_current_screen, 1, vncptr); + VbDisplayScreen(cparams, disp_current_screen, 1, vncptr); /* Add hardware ID */ used += Strncat(buf + used, "HWID: ", DEBUG_INFO_SIZE - used); |