X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fcbfstool%2Fcbfs.h;h=cdd003062fff7ada5d0af8ef622fc120b9c2002c;hb=a1e4824f73602a411826b27160a8818049ce0f97;hp=9661bbd2c983032bc525a6724c1fc723dc460d88;hpb=800379f7aa07ca54898faa2c51e6f41ea5b228df;p=coreboot.git

diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index 9661bbd2c..cdd003062 100644
--- 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 {
@@ -76,15 +76,17 @@ struct cbfs_payload {
 #define CBFS_COMPONENT_VSA        0x51
 #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
- * values. 
+ * values.
  */
 #define CBFS_COMPONENT_DELETED 0
 
-/* for all known FLASH, this value can be changed 
- * to all other values. This allows NULL files to be 
+/* for all known FLASH, this value can be changed
+ * to all other values. This allows NULL files to be
  * changed without a block erase
  */
 #define CBFS_COMPONENT_NULL 0xFFFFFFFF