[v2] r4206 - in trunk/coreboot-v2/src: lib stream

Author: oxygene
Date: 2009-04-24 18:44:34 +0200 (Fri, 24 Apr 2009)
New Revision: 4206

Modified:
   trunk/coreboot-v2/src/lib/Config.lb
   trunk/coreboot-v2/src/lib/lzma.c
   trunk/coreboot-v2/src/stream/rom_stream.c
   trunk/coreboot-v2/src/stream/serial_stream.c
Log:
Remove the inclusion of lzma.c (which really contains code) 
from another (rom_stream.c and others), instead linking it like any
source file should be linked.

The same should (and will) be done with nrv2b.c, but that has some
deeper implications as various CAR implementations include that
directly, and thus requires more care.

It fixes an issue with the cbfs code.

Signed-off-by: Patrick Georgi 
Acked-by: Ronald G. Minnich

Modified: trunk/coreboot-v2/src/lib/Config.lb
===================================================================
--- trunk/coreboot-v2/src/lib/Config.lb	2009-04-24 16:17:41 UTC (rev 4205)
+++ trunk/coreboot-v2/src/lib/Config.lb	2009-04-24 16:44:34 UTC (rev 4206)
@@ -31,3 +31,7 @@
 if CONFIG_CBFS
    object cbfs.o
 end
+
+if CONFIG_COMPRESSED_PAYLOAD_LZMA
+	object lzma.o
+end

Modified: trunk/coreboot-v2/src/lib/lzma.c
===================================================================
--- trunk/coreboot-v2/src/lib/lzma.c	2009-04-24 16:17:41 UTC (rev 4205)
+++ trunk/coreboot-v2/src/lib/lzma.c	2009-04-24 16:44:34 UTC (rev 4206)
@@ -11,9 +11,11 @@
 */

#include "lzmadecode.c"
+#include <console/console.h>
+#include <string.h>

-static unsigned long ulzma(unsigned char * src, unsigned char * dst)
+unsigned long ulzma(unsigned char * src, unsigned char * dst)
 {
    unsigned char properties[LZMA_PROPERTIES_SIZE];
    UInt32 outSize;

Modified: trunk/coreboot-v2/src/stream/rom_stream.c
===================================================================
--- trunk/coreboot-v2/src/stream/rom_stream.c	2009-04-24 16:17:41 UTC (rev 4205)
+++ trunk/coreboot-v2/src/stream/rom_stream.c	2009-04-24 16:44:34 UTC (rev 4206)
@@ -25,7 +25,7 @@
 #error "You're defining more than one compression type, which is not allowed."
 #endif
 #define HAVE_UNCOMPRESSER 1
-#include "../lib/lzma.c"
+unsigned long ulzma(unsigned char *src, unsigned char *dst);
 #endif

#ifndef CONFIG_ROM_PAYLOAD_START

Modified: trunk/coreboot-v2/src/stream/serial_stream.c
===================================================================
--- trunk/coreboot-v2/src/stream/serial_stream.c	2009-04-24 16:17:41 UTC (rev 4205)
+++ trunk/coreboot-v2/src/stream/serial_stream.c	2009-04-24 16:44:34 UTC (rev 4206)
@@ -19,7 +19,7 @@
 #error "You're defining more than one compression type, which is not allowed (of course)"
 #endif
 #define HAVE_UNCOMPRESSER 1
-#include "../lib/lzma.c"
+unsigned long ulzma(unsigned char *src, unsigned char *dst);
 #endif

#include "../lib/xmodem.c"