Hi,
the attached file removes 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.
As usual, it's
Signed-off-by: Patrick Georgi <[email protected]>
Patrick
Index: src/stream/rom_stream.c
===================================================================
--- src/stream/rom_stream.c (Revision 4204)
+++ src/stream/rom_stream.c (Arbeitskopie)
@@ -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
Index: src/stream/serial_stream.c
===================================================================
--- src/stream/serial_stream.c (Revision 4204)
+++ src/stream/serial_stream.c (Arbeitskopie)
@@ -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"
Index: src/lib/lzma.c
===================================================================
--- src/lib/lzma.c (Revision 4204)
+++ src/lib/lzma.c (Arbeitskopie)
@@ -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;
Index: src/lib/Config.lb
===================================================================
--- src/lib/Config.lb (Revision 4204)
+++ src/lib/Config.lb (Arbeitskopie)
@@ -31,3 +31,7 @@
if CONFIG_CBFS
object cbfs.o
end
+
+if CONFIG_COMPRESSED_PAYLOAD_LZMA
+ object lzma.o
+end
--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot
