[coreboot] [commit] r4936 - trunk/src/arch/i386/boot

[svn at coreboot.org]

Author: myles
Date: 2009-11-12 00:59:19 +0100 (Thu, 12 Nov 2009)
New Revision: 4936

Modified:
   trunk/src/arch/i386/boot/coreboot_table.c
Log:
Revert my too-hasty commit.

Signed-off-by: Myles Watson <mylesgw at gmail.com>
Acked-by: Myles Watson <mylesgw at gmail.com>



Modified: trunk/src/arch/i386/boot/coreboot_table.c
===================================================================
--- trunk/src/arch/i386/boot/coreboot_table.c	2009-11-11 23:32:36 UTC (rev 4935)
+++ trunk/src/arch/i386/boot/coreboot_table.c	2009-11-11 23:59:19 UTC (rev 4936)
@@ -485,10 +485,11 @@
 
 #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);
 	}