summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@secunet.com>2011-01-21 13:20:10 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2011-01-21 13:20:10 +0000
commita3eb534f18b2708839ef6a97cc1161c0a4af43cc (patch)
tree8cd06dfdeb0e2f810a9eb352f1790d5eb42b7e0b /src/arch/x86
parentf0bf4b5c2abd9a226dd681d88132e8d66f8ba92a (diff)
... 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
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/boot/coreboot_table.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/arch/x86/boot/coreboot_table.c b/src/arch/x86/boot/coreboot_table.c
index dea030b60a..d883d2d6af 100644
--- 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 {