diff options
| author | Dave Parker <dparker@chromium.org> | 2012-08-01 08:16:38 -0700 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-08-09 01:56:44 -0700 |
| commit | 3985f94fae52aa1df853f7d47388c67c3022e069 (patch) | |
| tree | 122e2b83a9fd2d083bab12c5d4f2025691bfcc45 /utility | |
| parent | 6c34ecf61bf621e4b4cfffb3f99732eb9930e85c (diff) | |
| download | vboot-3985f94fae52aa1df853f7d47388c67c3022e069.tar.gz | |
Increase max number of bitmaps to composite to 16 per screen.
This is needed to render new-style screens that use 13 bitmaps.
bmpblk version is changed from 1.2 to 2.0, due to incompatibility.
BUG=chrome-os-partner:11078
TEST=emerge-<board> vboot-reference. Run firmware with new bmpblock.
Original-Change-Id: I750da66b020fe195896df58f31fcbb2a9e33e404
Reviewed-on: https://gerrit.chromium.org/gerrit/28945
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Tested-by: Dave Parker <dparker@chromium.org>
(cherry picked from commit 0b7ee46c2eeba858ff59d534e265b445895623a2)
Change-Id: I80543c46a7c0e09169e29e32077d84c57192e431
Reviewed-on: https://gerrit.chromium.org/gerrit/29602
Reviewed-by: Dave Parker <dparker@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Commit-Ready: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Tom Wai-Hong Tam <waihong@chromium.org>
Diffstat (limited to 'utility')
| -rw-r--r-- | utility/bmpblk_utility.cc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/utility/bmpblk_utility.cc b/utility/bmpblk_utility.cc index 2846746f..386d2d44 100644 --- a/utility/bmpblk_utility.cc +++ b/utility/bmpblk_utility.cc @@ -189,20 +189,7 @@ namespace vboot_reference { error("Syntax error in parsing bmpblock.\n"); } string gotversion = (char*)event.data.scalar.value; - if (gotversion == "1.2") { - render_hwid_ = true; - support_font_ = true; - } else if (gotversion == "1.1") { - minor_version_ = 1; - render_hwid_ = true; - support_font_ = false; - fprintf(stderr, "WARNING: using old format: %s\n", gotversion.c_str()); - } else if (gotversion == "1.0") { - minor_version_ = 0; - render_hwid_ = false; - support_font_ = false; - fprintf(stderr, "WARNING: using old format: %s\n", gotversion.c_str()); - } else { + if (gotversion != "2.0") { error("Unsupported version specified in config file (%s)\n", gotversion.c_str()); } |