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 /scripts | |
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 'scripts')
-rw-r--r-- | scripts/newbitmaps/README | 6 | ||||
-rw-r--r-- | scripts/newbitmaps/default_source/bmpblock.bin | bin | 130686 -> 134718 bytes | |||
-rw-r--r-- | scripts/newbitmaps/default_source/config.yaml | 2 | ||||
-rwxr-xr-x | scripts/newbitmaps/images/make_default_yaml | 2 |
4 files changed, 8 insertions, 2 deletions
diff --git a/scripts/newbitmaps/README b/scripts/newbitmaps/README index 5bc2d6fd..1720063d 100644 --- a/scripts/newbitmaps/README +++ b/scripts/newbitmaps/README @@ -74,6 +74,12 @@ The old v1.1 bmpblock will be accepted by the vboot wrapper, but a $HWID screen without a corresponding font should be silently ignored. +Version 2.0. Used by BIOS with complex composition (Kiev, Link, Snow, etc.) + +The max number of components in one screen has increased from 8 to 16, makes +bitmap block structure incompatible with previous versions. + + -------------------------------------------- Instructions for manually rebuilding things: diff --git a/scripts/newbitmaps/default_source/bmpblock.bin b/scripts/newbitmaps/default_source/bmpblock.bin Binary files differindex 2dc10c6c..3785fb00 100644 --- a/scripts/newbitmaps/default_source/bmpblock.bin +++ b/scripts/newbitmaps/default_source/bmpblock.bin diff --git a/scripts/newbitmaps/default_source/config.yaml b/scripts/newbitmaps/default_source/config.yaml index 32729542..00babb8d 100644 --- a/scripts/newbitmaps/default_source/config.yaml +++ b/scripts/newbitmaps/default_source/config.yaml @@ -3,7 +3,7 @@ # original sources are lost in the mists of time, so most of this is simply # unpacked from the binary. -bmpblock: 1.2 +bmpblock: 2.0 compression: 2 images: $HWID: FONTS.bmp # 0x0 4092/58196 tag=1 fmt=2 diff --git a/scripts/newbitmaps/images/make_default_yaml b/scripts/newbitmaps/images/make_default_yaml index 186bfcee..2ff1b7b9 100755 --- a/scripts/newbitmaps/images/make_default_yaml +++ b/scripts/newbitmaps/images/make_default_yaml @@ -139,7 +139,7 @@ for hwid_bmp in hwid_unknown.bmp; do # List the images. The major difference is the HWID. cat >"$yaml_file" <<'EOF1' -bmpblock: 1.2 +bmpblock: 2.0 compression: 1 |