Change GBB bmpblock to version 1.1, supporting direct HWID rendering.

With version 1.0, the BIOS displays its screens using composited images, but
we still have to create a new bmp image for every HWID. Version 1.1 lets us
render the ASCII HWID string directly, so the BIOS screens don't need
modification just because the HWID changes.

In the yaml file, we just replace the hwid image with a magic string, like
so:

  bmpblock: 1.1

  [...]

  screens:
    en_remove:
      - [  0,   0, remove_bg]
      - [256, 534, en_model_text]
      - [314, 534, $HWID]
      - [192, 479, url]
      - [195, 453, en_remove_text]

This change modifies the bmpblk_utility to accept and generate both 1.0 and
1.1 versions. It also updates the supporting scripts (most of which aren't
needed anymore) and adds a new DEFAULT.yaml file which can be used as the
basis for all locales.

BUG=chrome-os-partner:3264
TEST=none (manual)

Change-Id: I012349393848393928282
Reviewed-on: http://gerrit.chromium.org/gerrit/378
Tested-by: Bill Richardson <wfrichar@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>

1 files changed, 9 insertions, 1 deletions

diff --git a/firmware/include/bmpblk_header.h b/firmware/include/bmpblk_header.h
index 3edd6739..09474d76 100644
--- a/firmware/include/bmpblk_header.h
+++ b/firmware/include/bmpblk_header.h
@@ -52,7 +52,7 @@ __pragma(pack(push, 1))  /* Support packing for MSVC. */
 #define BMPBLOCK_SIGNATURE_SIZE (4)
 
 #define BMPBLOCK_MAJOR_VERSION  (0x0001)
-#define BMPBLOCK_MINOR_VERSION  (0x0000)
+#define BMPBLOCK_MINOR_VERSION  (0x0001)
 
 #define MAX_IMAGE_IN_LAYOUT     (8)
 
@@ -106,6 +106,7 @@ typedef struct ImageInfo {
 typedef enum ImageTag {
   TAG_NONE = 0,
   TAG_HWID,
+  TAG_HWID_RTOL,            /* "right-to-left", ie, right-justified HWID */
 } ImageTag;
 
 /* Constants for ImageInfo.format */
@@ -122,6 +123,13 @@ typedef enum Compression {
   MAX_COMPRESS,
 } Compression;
 
+/* These magic image names can be used in the .yaml file to indicate that
+   the ASCII HWID should be displayed. For RENDER_HWID, the image coordinates
+   specify upper-left corner of the HWID string. For RENDER_HWID_RTOL, they
+   indicate the upper-right corner (handy for right-to-left languages). */
+#define RENDER_HWID       "$HWID"
+#define RENDER_HWID_RTOL  "$HWID.rtol"
+
 __pragma(pack(pop)) /* Support packing for MSVC. */
 
 #endif  /* VBOOT_REFERENCE_BMPBLK_HEADER_H_ */