diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-08-01 17:49:27 +0200 |
| commit | e986897cd0fdeae46ec0933d0acc7c5d5efa4008 (patch) | |
| tree | a793c8648a7f0b69bfe63b8dc0c6ff3ad34c5a56 /lib | |
| parent | 363a1343698aa2d3aeaee8f7d115ca01e3ae7b32 (diff) | |
| parent | 991e1caf2fdaf018a7949f1c138052ff4354b509 (diff) | |
| download | barebox-e986897cd0fdeae46ec0933d0acc7c5d5efa4008.tar.gz barebox-e986897cd0fdeae46ec0933d0acc7c5d5efa4008.tar.xz | |
Merge branch 'for-next/compressed-prepare'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/decompress_unlzo.c | 10 | ||||
| -rw-r--r-- | lib/lzo/lzo1x_decompress.c | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c index 000bd704c3..56abfc6e6c 100644 --- a/lib/decompress_unlzo.c +++ b/lib/decompress_unlzo.c @@ -33,11 +33,16 @@ #include <common.h> #include <malloc.h> #include <linux/types.h> -#include <lzo.h> #include <errno.h> #include <fs.h> #include <xfuncs.h> +#ifdef STATIC +#include "lzo/lzo1x_decompress.c" +#endif + +#include <lzo.h> + #include <linux/compiler.h> #include <asm/unaligned.h> @@ -106,7 +111,7 @@ static inline int parse_header(u8 *input, int *skip, int in_len) return 1; } -int decompress_unlzo(u8 *input, int in_len, +STATIC int decompress_unlzo(u8 *input, int in_len, int (*fill) (void *, unsigned int), int (*flush) (void *, unsigned int), u8 *output, int *posp, @@ -284,3 +289,4 @@ exit_1: exit: return ret; } +#define decompress decompress_unlzo diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress.c index af943829dc..7f1451f085 100644 --- a/lib/lzo/lzo1x_decompress.c +++ b/lib/lzo/lzo1x_decompress.c @@ -23,7 +23,7 @@ #define COPY4(dst, src) \ put_unaligned(get_unaligned((const u32 *)(src)), (u32 *)(dst)) -int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, +STATIC int lzo1x_decompress_safe(const unsigned char *in, size_t in_len, unsigned char *out, size_t *out_len) { const unsigned char * const ip_end = in + in_len; |