New commandline args are clearer, and prepare for compression.

firmware/include/bmpblk_header.h

 /* 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             |
  *  +-----------------------------------------+
@@ skipping 76 matching lines @@
   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 compression;      /* Compression method for 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? */
+  MAX_COMPRESS,

[Randall Spangler, 2011/02/10 21:45:10]

COMPRESS_MAX, for consistency?

 } Compression;
 
 #endif  /* VBOOT_REFERENCE_BMPBLK_HEADER_H_ */