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 <patrick.georgi@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4206 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi 2009-04-24 16:44:34 +00:00
parent a5de85cb86
commit 7994164a0e
4 changed files with 9 additions and 3 deletions

View File

@ -31,3 +31,7 @@ end
if CONFIG_CBFS if CONFIG_CBFS
object cbfs.o object cbfs.o
end end
if CONFIG_COMPRESSED_PAYLOAD_LZMA
object lzma.o
end

View File

@ -11,9 +11,11 @@ SDK 4.42, which is written and distributed to public domain by Igor Pavlov.
*/ */
#include "lzmadecode.c" #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]; unsigned char properties[LZMA_PROPERTIES_SIZE];
UInt32 outSize; UInt32 outSize;

View File

@ -25,7 +25,7 @@ extern unsigned char _heap, _eheap;
#error "You're defining more than one compression type, which is not allowed." #error "You're defining more than one compression type, which is not allowed."
#endif #endif
#define HAVE_UNCOMPRESSER 1 #define HAVE_UNCOMPRESSER 1
#include "../lib/lzma.c" unsigned long ulzma(unsigned char *src, unsigned char *dst);
#endif #endif
#ifndef CONFIG_ROM_PAYLOAD_START #ifndef CONFIG_ROM_PAYLOAD_START

View File

@ -19,7 +19,7 @@
#error "You're defining more than one compression type, which is not allowed (of course)" #error "You're defining more than one compression type, which is not allowed (of course)"
#endif #endif
#define HAVE_UNCOMPRESSER 1 #define HAVE_UNCOMPRESSER 1
#include "../lib/lzma.c" unsigned long ulzma(unsigned char *src, unsigned char *dst);
#endif #endif
#include "../lib/xmodem.c" #include "../lib/xmodem.c"