[coreboot] [v2] r4079 - trunk/coreboot-v2/src/lib

[svn at coreboot.org]

Author: rminnich
Date: 2009-04-07 01:28:22 +0200 (Tue, 07 Apr 2009)
New Revision: 4079

Modified:
   trunk/coreboot-v2/src/lib/romfs.c
Log:
This fixes a bug in romfs code; see comment. If we add the pci rom 
to romfs for qemu,we get this: 
Check pci1013,00b8.rom
found it, @ fff99698, first word is e946aa55
In cbfs, rom address for PCI: 00:02.0 = 0
On mainboard, rom address for PCI: 00:02.0 = fff99698
copying VGA ROM Image from fff99698 to 0xc0000, 0x8c00 bytes

This is sort of OK, excpet that when it gets to payload time, the 
system explodes. I suspect that copy is kind of a problem. 

But this is a pretty important bug fix so in it goes. 

Signed-off-by: Ronald G. Minnich <rminnich at gmail.com>
Acked-by: Ronald G. Minnich <rminnich at gmail.com>


Modified: trunk/coreboot-v2/src/lib/romfs.c
===================================================================
--- trunk/coreboot-v2/src/lib/romfs.c	2009-04-06 20:38:34 UTC (rev 4078)
+++ trunk/coreboot-v2/src/lib/romfs.c	2009-04-06 23:28:22 UTC (rev 4079)
@@ -151,7 +151,8 @@
 	 * return a pointer to it. 
  	 */
 
-	src = ((unsigned char *) orom) + sizeof(struct romfs_optionrom);
+	/* BUG: the romtool is (not yet) including a romfs_optionrom header */
+	src = ((unsigned char *) orom); // + sizeof(struct romfs_optionrom);
 
 	if (! dest)
 		return src;