summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2009-11-11 23:59:19 +0000
committerMyles Watson <mylesgw@gmail.com>2009-11-11 23:59:19 +0000
commit339722e89e7e6462b8fc152c8c49fbdfbcae6606 (patch)
tree4d4e59ffb8bfb71499f78c26bbc54c92941e5483
parent8f848137755934d1ec91fb188500881796694d28 (diff)
Revert my too-hasty commit.
Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4936 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/arch/i386/boot/coreboot_table.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/arch/i386/boot/coreboot_table.c b/src/arch/i386/boot/coreboot_table.c
index afe70d6ff6..9eb13b73f1 100644
--- a/src/arch/i386/boot/coreboot_table.c
+++ b/src/arch/i386/boot/coreboot_table.c
@@ -485,10 +485,11 @@ unsigned long write_coreboot_table(
#if (CONFIG_HAVE_OPTION_TABLE == 1)
{
- struct lb_record *rec_dest;
- /* Copy the option config table, it's already a lb_record... */
+ struct lb_record *rec_dest, *rec_src;
+ /* Write the option config table... */
rec_dest = lb_new_record(head);
- memcpy(rec_dest, &option_table, sizeof(option_table));
+ rec_src = (struct lb_record *)(void *)&option_table;
+ memcpy(rec_dest, rec_src, rec_src->size);
/* Create cmos checksum entry in coreboot table */
lb_cmos_checksum(head);
}