Various fixes to cbfstool.

[coreboot.git] / util / cbfstool / cbfs.h

diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index 6fb9edd68cb429e0c0252adbe9d23008f00db011..cdd003062fff7ada5d0af8ef622fc120b9c2002c 100644 (file)
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -29,7 +29,7 @@ struct cbfs_header {
 } __attribute__ ((packed));
 
 struct cbfs_file {
-       char magic[8];
+       uint8_t magic[8];
        uint32_t len;
        uint32_t type;
        uint32_t checksum;
@@ -37,11 +37,11 @@ struct cbfs_file {
 } __attribute__ ((packed));
 
 struct cbfs_stage {
-       unsigned int compression;
-       unsigned long long entry;
-       unsigned long long load;
-       unsigned int len;
-       unsigned int memlen;
+       uint32_t compression;
+       uint64_t entry;
+       uint64_t load;
+       uint32_t len;
+       uint32_t memlen;
 } __attribute__ ((packed));
 
 #define PAYLOAD_SEGMENT_CODE   0x45444F43
@@ -51,12 +51,12 @@ struct cbfs_stage {
 #define PAYLOAD_SEGMENT_ENTRY  0x52544E45
 
 struct cbfs_payload_segment {
-       unsigned int type;
-       unsigned int compression;
-       unsigned int offset;
-       unsigned long long load_addr;
-       unsigned int len;
-       unsigned int mem_len;
+       uint32_t type;
+       uint32_t compression;
+       uint32_t offset;
+       uint64_t load_addr;
+       uint32_t len;
+       uint32_t mem_len;
 } __attribute__ ((packed));
 
 struct cbfs_payload {
@@ -77,6 +77,7 @@ struct cbfs_payload {
 #define CBFS_COMPONENT_MBI        0x52
 #define CBFS_COMPONENT_MICROCODE  0x53
 #define CBFS_COMPONENT_CMOS_DEFAULT 0xaa
+#define CBFS_COMPONENT_CMOS_LAYOUT 0x01aa
 
 /* The deleted type is chosen to be a value
  * that can be written in a FLASH from all other