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 /firmware/include | |
| 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 'firmware/include')
| -rw-r--r-- | firmware/include/bmpblk_header.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/include/bmpblk_header.h b/firmware/include/bmpblk_header.h index c99f0fe3..06ddaa8f 100644 --- a/firmware/include/bmpblk_header.h +++ b/firmware/include/bmpblk_header.h @@ -53,10 +53,10 @@ __pragma(pack(push, 1)) /* Support packing for MSVC. */ #define BMPBLOCK_SIGNATURE "$BMP" #define BMPBLOCK_SIGNATURE_SIZE (4) -#define BMPBLOCK_MAJOR_VERSION (0x0001) -#define BMPBLOCK_MINOR_VERSION (0x0002) +#define BMPBLOCK_MAJOR_VERSION (0x0002) +#define BMPBLOCK_MINOR_VERSION (0x0000) -#define MAX_IMAGE_IN_LAYOUT (8) +#define MAX_IMAGE_IN_LAYOUT (16) /* BMPBLOCK header, describing how many screen layouts and image infos */ typedef struct BmpBlockHeader { |