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:
parent
a5de85cb86
commit
7994164a0e
|
@ -31,3 +31,7 @@ end
|
|||
if CONFIG_CBFS
|
||||
object cbfs.o
|
||||
end
|
||||
|
||||
if CONFIG_COMPRESSED_PAYLOAD_LZMA
|
||||
object lzma.o
|
||||
end
|
||||
|
|
|
@ -11,9 +11,11 @@ SDK 4.42, which is written and distributed to public domain by Igor Pavlov.
|
|||
*/
|
||||
|
||||
#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;
|
||||
|
|
|
@ -25,7 +25,7 @@ extern unsigned char _heap, _eheap;
|
|||
#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
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue