Slight modification to a previously-LGTM'd CL, to work with ebuild changes.

firmware/include/bmpblk_header.h

Index: firmware/include/bmpblk_header.h
diff --git a/firmware/include/bmpblk_header.h b/firmware/include/bmpblk_header.h
new file mode 100644
index 0000000000000000000000000000000000000000..3aa981ce06b47b487c77367ae38595b177d298a6
--- /dev/null
+++ b/firmware/include/bmpblk_header.h
@@ -0,0 +1,123 @@
+/* Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ *
+ * Data structure definitions for firmware screen block (BMPBLOCK).
+ *
+ * The BmpBlock structure looks like:
+ *  +-----------------------------------------+
+ *  |             BmpBlock Header             |
+ *  +-----------------------------------------+
+ *  |             ScreenLayout[0]             | \
+ *  +-----------------------------------------+  |
+ *  |             ScreenLayout[1]             |  |
+ *  +-----------------------------------------+  Localization[0]
+ *  |                  ...                    |  |
+ *  +-----------------------------------------+  |
+ *  | ScreenLayout[number_of_screenlayouts-1] | /
+ *  +-----------------------------------------+
+ *  |             ScreenLayout[0]             | \
+ *  +-----------------------------------------+  Localization[1]
+ *  |                  ...                    | /
+ *  +-----------------------------------------+        ...
+ *  |             ScreenLayout[0]             | \
+ *  +-----------------------------------------+  Localization[
+ *  |                  ...                    | /   number_of_localizations-1]
+ *  +-----------------------------------------+
+ *  |              ImageInfo[0]               |
+ *  +-----------------------------------------+
+ *  |              Image Content              |
+ *  +-----------------------------------------+
+ *  |              ImageInfo[2]               |  ImageInfo is 4-byte aligned.
+ *  +-----------------------------------------+
+ *  |              Image Content              |
+ *  +-----------------------------------------+
+ *  |                  ...                    |
+ *  +-----------------------------------------+
+ *  |      ImageInfo[number_fo_images-1]      |
+ *  +-----------------------------------------+
+ *  |              Image Content              |
+ *  +-----------------------------------------+
+ *
+ */
+
+#ifndef VBOOT_REFERENCE_BMPBLK_HEADER_H_
+#define VBOOT_REFERENCE_BMPBLK_HEADER_H_
+
+#include "sysincludes.h"
+
+__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  (0x0000)
+
+#define MAX_IMAGE_IN_LAYOUT     (8)
+
+/* BMPBLOCK header, describing how many screen layouts and image infos */
+typedef struct BmpBlockHeader {
+  uint8_t  signature[BMPBLOCK_SIGNATURE_SIZE];  /* BMPBLOCK_SIGNATURE $BMP */
+  uint16_t major_version;            /* see BMPBLOCK_MAJOR_VER */
+  uint16_t minor_version;            /* see BMPBLOCK_MINOR_VER */
+  uint32_t number_of_localizations;  /* Number of localizations */
+  uint32_t number_of_screenlayouts;  /* Number of screen layouts in each
+                                      * localization */
+  uint32_t number_of_imageinfos;     /* Number of image infos */
+  uint32_t reserved[3];
+} __attribute__((packed)) BmpBlockHeader;
+
+/* Screen layout, describing how to stack multiple images on screen */
+typedef struct ScreenLayout {
+  struct {
+    uint32_t x;                   /* X-offset of the image to be rendered */
+    uint32_t y;                   /* Y-offset of the image to be rendered */
+    uint32_t image_info_offset;   /* Offset of image info from start of
+                                   * BMPBLOCK. 0 means end of it. */
+  } images[MAX_IMAGE_IN_LAYOUT];  /* Images contained in the screen. Will be
+                                   * rendered from 0 to (number_of_images-1). */
+} __attribute__((packed)) ScreenLayout;
+
+/* Constants for screen index */
+typedef enum ScreenIndex {
+  SCREEN_DEVELOPER_MODE = 0,
+  SCREEN_RECOVERY_MODE,
+  SCREEN_RECOVERY_NO_OS,
+  SCREEN_RECOVERY_MISSING_OS,
+  MAX_SCREEN_INDEX,
+} ScreenIndex;
+
+/* Image info, describing the information of the image block */
+typedef struct ImageInfo {
+  uint32_t tag;              /* Tag it as a special image, like HWID */
+  uint32_t width;            /* Width of the image */
+  uint32_t height;           /* Height of the image */
+  uint32_t format;           /* File format of the image */
+  uint32_t compression;      /* Compression method to the image file */
+  uint32_t original_size;    /* Size of the original uncompressed image */
+  uint32_t compressed_size;  /* Size of the compressed image */
+  uint32_t reserved;
+  /* NOTE: actual image content follows immediately */
+} __attribute__((packed)) ImageInfo;
+
+/* Constants for ImageInfo.tag */
+typedef enum ImageTag {
+  TAG_NONE = 0,
+  TAG_HWID,
+} ImageTag;
+
+/* Constants for ImageInfo.format */
+typedef enum ImageFormat {
+  FORMAT_INVALID = 0,
+  FORMAT_BMP,
+} ImageFormat;
+
+/* Constants for ImageInfo.compression */
+typedef enum Compression {
+  COMPRESS_NONE = 0,
+  COMPRESS_EFIv1,           /* The x86 BIOS only supports this */
+  COMPRESS_TBD,             /* Only on ARM? */
+} Compression;
+
+#endif  /* VBOOT_REFERENCE_BMPBLK_HEADER_H_ */