... And fix the other compile time issues in cmos_layout.bin support

Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com>
Acked-by: Patrick Georgi <patrick.georgi@secunet.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6291 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/arch/x86/boot/coreboot_table.c b/src/arch/x86/boot/coreboot_table.c
index dea030b60ac56b8d25cac6d707c8a9f6af01a032..d883d2d6afb2a36aa83f0a1394a60ad79eaca867 100644 (file)
--- a/src/arch/x86/boot/coreboot_table.c
+++ b/src/arch/x86/boot/coreboot_table.c
@@ -31,6 +31,7 @@
 #include <stdlib.h>
 #if (CONFIG_USE_OPTION_TABLE == 1)
 #include <option_table.h>
+#include <cbfs.h>
 #endif
 
 static struct lb_header *lb_table_init(unsigned long addr)
@@ -542,11 +543,11 @@ unsigned long write_coreboot_table(
 
 #if (CONFIG_USE_OPTION_TABLE == 1)
        {
-               struct cmos_option_table option_table = cbfs_find_file("cmos_layout.bin", 0x1aa);
+               struct cmos_option_table *option_table = cbfs_find_file("cmos_layout.bin", 0x1aa);
                if (option_table) {
                        struct lb_record *rec_dest = lb_new_record(head);
                        /* Copy the option config table, it's already a lb_record... */
-                       memcpy(rec_dest,  &option_table, option_table.size);
+                       memcpy(rec_dest,  &option_table, option_table->size);
                        /* Create cmos checksum entry in coreboot table */
                        lb_cmos_checksum(head);
                } else {