Revert my too-hasty commit.
authorMyles Watson <mylesgw@gmail.com>
Wed, 11 Nov 2009 23:59:19 +0000 (23:59 +0000)
committerMyles Watson <mylesgw@gmail.com>
Wed, 11 Nov 2009 23:59:19 +0000 (23:59 +0000)
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

src/arch/i386/boot/coreboot_table.c

index afe70d6ff62f26c112c4b2e1930f3b6f7603536a..9eb13b73f1e5f7ca744fad3de3ed5eaaa215cb33 100644 (file)
@@ -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);
        }