From 9f6702a3770cea40be72fe714d2a3c50bdf82535 Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Tue, 14 Aug 2012 15:41:13 -0700 Subject: (firmware-parrot)Add WAIT screen to default bitmap Some systems take a long time to program the EC firmware (because it's behind a really slow I2C bus or something). This could happen at any boot as part of software sync. If it's necessary to reprogram the EC on a slow system, we need to display a BIOS screen to the user so he/she doesn't think it's bricked. This CL is just to add a new default bitmap so we'll have something to display when we need it. Nothing actually uses it yet. BUG=chrome-os-partner:12254 TEST=none There should be no user-visible changes. We don't invoke this screen yet. Original-Change-Id: Icb922f933e2e921472dbdff7a26a3ca4d58fbba3 Signed-off-by: Bill Richardson Reviewed-on: https://gerrit.chromium.org/gerrit/29241 Reviewed-by: Hung-Te Lin (cherry picked from commit b48cd672a731df7866b43110c62ebbbf23120125) Change-Id: Iea833bd10258c45fc0eae7e751e163d0f7e213e4 Signed-off-by: Duncan Laurie Reviewed-on: https://gerrit.chromium.org/gerrit/30325 Reviewed-by: Jay Kim --- firmware/include/vboot_api.h | 1 + firmware/lib/vboot_display.c | 3 +++ scripts/newbitmaps/default_source/WAIT.bmp | Bin 0 -> 43926 bytes scripts/newbitmaps/default_source/bmpblock.bin | Bin 0 -> 130686 bytes scripts/newbitmaps/default_source/config.yaml | 17 +++++++++++------ 5 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 scripts/newbitmaps/default_source/WAIT.bmp create mode 100644 scripts/newbitmaps/default_source/bmpblock.bin diff --git a/firmware/include/vboot_api.h b/firmware/include/vboot_api.h index b6748fc8..5d29cf2a 100644 --- a/firmware/include/vboot_api.h +++ b/firmware/include/vboot_api.h @@ -525,6 +525,7 @@ enum VbScreenType_t { VB_SCREEN_RECOVERY_NO_GOOD = 0x203, /* Recovery - inserted image invalid */ VB_SCREEN_RECOVERY_TO_DEV = 0x204, /* Recovery - confirm dev mode */ VB_SCREEN_DEVELOPER_TO_NORM = 0x205, /* Developer - confirm normal mode */ + VB_SCREEN_WAIT = 0x206, /* Please wait - programming EC */ }; /* Initialize and clear the display. Set width and height to the screen diff --git a/firmware/lib/vboot_display.c b/firmware/lib/vboot_display.c index f49155be..94feff1d 100644 --- a/firmware/lib/vboot_display.c +++ b/firmware/lib/vboot_display.c @@ -225,6 +225,9 @@ VbError_t VbDisplayScreenFromGBB(VbCommonParams* cparams, uint32_t screen, case VB_SCREEN_DEVELOPER_TO_NORM: screen_index = 5; break; + case VB_SCREEN_WAIT: + screen_index = 6; + break; case VB_SCREEN_BLANK: case VB_SCREEN_DEVELOPER_EGG: default: diff --git a/scripts/newbitmaps/default_source/WAIT.bmp b/scripts/newbitmaps/default_source/WAIT.bmp new file mode 100644 index 00000000..5598edfe Binary files /dev/null and b/scripts/newbitmaps/default_source/WAIT.bmp differ diff --git a/scripts/newbitmaps/default_source/bmpblock.bin b/scripts/newbitmaps/default_source/bmpblock.bin new file mode 100644 index 00000000..2dc10c6c Binary files /dev/null and b/scripts/newbitmaps/default_source/bmpblock.bin differ diff --git a/scripts/newbitmaps/default_source/config.yaml b/scripts/newbitmaps/default_source/config.yaml index 134839fd..32729542 100644 --- a/scripts/newbitmaps/default_source/config.yaml +++ b/scripts/newbitmaps/default_source/config.yaml @@ -34,6 +34,7 @@ images: zh_CH_yuck: zh_CH_yuck.bmp # 588x23 5357/14602 tag=0 fmt=1 TODEV: TODEV.bmp TONORM: TONORM.bmp + WAIT: WAIT.bmp screens: scr_en_dev: - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 @@ -159,14 +160,18 @@ screens: - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 - [221, 372, TONORM] - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 + scr_en_wait: + - [0, 0, UNOFFICIAL] # tag=0 fmt=1 c=2 4595/308278 + - [221, 372, WAIT] + - [100, 175, $HWID] # tag=1 fmt=2 c=2 4092/58196 localizations: - - [ scr_en_dev, scr_en_remove, scr_en_yuck, scr_en_insert, scr_en_todev, scr_en_tonorm ] - - [ scr_zh_dev, scr_zh_remove, scr_zh_yuck, scr_zh_insert, scr_en_todev, scr_en_tonorm ] - - [ scr_fr_dev, scr_fr_remove, scr_fr_yuck, scr_fr_insert, scr_en_todev, scr_en_tonorm ] - - [ scr_es_dev, scr_es_remove, scr_es_yuck, scr_es_insert, scr_en_todev, scr_en_tonorm ] - - [ scr_it_dev, scr_it_remove, scr_it_yuck, scr_it_insert, scr_en_todev, scr_en_tonorm ] - - [ scr_de_dev, scr_de_remove, scr_de_yuck, scr_de_insert, scr_en_todev, scr_en_tonorm ] + - [ scr_en_dev, scr_en_remove, scr_en_yuck, scr_en_insert, scr_en_todev, scr_en_tonorm, scr_en_wait ] + - [ scr_zh_dev, scr_zh_remove, scr_zh_yuck, scr_zh_insert, scr_en_todev, scr_en_tonorm, scr_en_wait ] + - [ scr_fr_dev, scr_fr_remove, scr_fr_yuck, scr_fr_insert, scr_en_todev, scr_en_tonorm, scr_en_wait ] + - [ scr_es_dev, scr_es_remove, scr_es_yuck, scr_es_insert, scr_en_todev, scr_en_tonorm, scr_en_wait ] + - [ scr_it_dev, scr_it_remove, scr_it_yuck, scr_it_insert, scr_en_todev, scr_en_tonorm, scr_en_wait ] + - [ scr_de_dev, scr_de_remove, scr_de_yuck, scr_de_insert, scr_en_todev, scr_en_tonorm, scr_en_wait ] locale_index: - en - zh_TW -- cgit v1.2.1