X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=payloads%2Flibpayload%2Farch%2Fi386%2Fcoreboot.c;h=a77144b2c4d07f91db4489cfaf94f05bf13706c9;hb=46404d75e4dc106268e1027a4828d8ea4f17f389;hp=bdef4e85d3de9866651233e99d26e05cb5893d7b;hpb=d1bc331855caab351a70676b5085787292a45fea;p=coreboot.git

diff --git a/payloads/libpayload/arch/i386/coreboot.c b/payloads/libpayload/arch/i386/coreboot.c
index bdef4e85d..a77144b2c 100644
--- a/payloads/libpayload/arch/i386/coreboot.c
+++ b/payloads/libpayload/arch/i386/coreboot.c
@@ -63,10 +63,10 @@ static void cb_parse_memory(unsigned char *ptr, struct sysinfo_t *info)
 #endif
 
 		info->memrange[info->n_memranges].base =
-		    UNPACK_CB64(range->start);
+		    cb_unpack64(range->start);
 
 		info->memrange[info->n_memranges].size =
-		    UNPACK_CB64(range->size);
+		    cb_unpack64(range->size);
 
 		info->memrange[info->n_memranges].type = range->type;
 
@@ -82,6 +82,12 @@ static void cb_parse_serial(unsigned char *ptr, struct sysinfo_t *info)
 	info->ser_ioport = ser->baseaddr;
 }
 
+static void cb_parse_version(unsigned char *ptr, struct sysinfo_t *info)
+{
+	struct cb_string *ver = (struct cb_string *)ptr;
+	info->cb_version = (char *)ver->string;
+}
+
 #ifdef CONFIG_NVRAM
 static void cb_parse_optiontable(unsigned char *ptr, struct sysinfo_t *info)
 {
@@ -148,6 +154,9 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
 		case CB_TAG_SERIAL:
 			cb_parse_serial(ptr, info);
 			break;
+		case CB_TAG_VERSION:
+			cb_parse_version(ptr, info);
+			break;
 #ifdef CONFIG_NVRAM
 		case CB_TAG_CMOS_OPTION_TABLE:
 			cb_parse_optiontable(ptr, info);