Author: stepan Date: 2007-08-20 00:58:42 +0200 (Mon, 20 Aug 2007) New Revision: 469
Modified: LinuxBIOSv3/util/lar/Makefile LinuxBIOSv3/util/lar/lar.h LinuxBIOSv3/util/nrv2b/nrv2b.c Log: Always compile in all compression algorithms. This is required for building in an unconfigured tree and to continue with Jordans patches.
Signed-off-by: Stefan Reinauer stepan@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: LinuxBIOSv3/util/lar/Makefile =================================================================== --- LinuxBIOSv3/util/lar/Makefile 2007-08-19 17:21:20 UTC (rev 468) +++ LinuxBIOSv3/util/lar/Makefile 2007-08-19 22:58:42 UTC (rev 469) @@ -1,7 +1,7 @@ ## ## lar - LinuxBIOS archiver ## -## Copyright (C) 2006 coresystems GmbH +## Copyright (C) 2006-2007 coresystems GmbH ## (Written by Stefan Reinauer stepan@coresystems.de for coresystems GmbH) ## ## This program is free software; you can redistribute it and/or modify @@ -22,15 +22,11 @@
LARDIR := lardir
-ifeq ($(CONFIG_COMPRESSION_LZMA),y) COMPRESSOR := $(LZMA_OBJ) $(obj)/util/lzma/lzma-compress.o LARDIR += lzmadir -endif
-ifeq ($(CONFIG_COMPRESSION_NRV2B),y) COMPRESSOR += $(obj)/util/nrv2b/nrv2b-compress.o LARDIR += nrv2bdir -endif
LAROBJ_ABS := $(patsubst %,$(obj)/util/lar/%,$(LAROBJ))
Modified: LinuxBIOSv3/util/lar/lar.h =================================================================== --- LinuxBIOSv3/util/lar/lar.h 2007-08-19 17:21:20 UTC (rev 468) +++ LinuxBIOSv3/util/lar/lar.h 2007-08-19 22:58:42 UTC (rev 469) @@ -78,29 +78,13 @@
void compress_impossible(char *in, u32 in_len, char *out, u32 *out_len); void do_no_compress(char *in, u32 in_len, char *out, u32 *out_len); -#ifdef CONFIG_COMPRESSION_LZMA void do_lzma_compress(char *in, u32 in_len, char *out, u32 *out_len); -#else -#define do_lzma_compress compress_impossible -#endif -#ifdef CONFIG_COMPRESSION_NRV2B void do_nrv2b_compress(char *in, u32 in_len, char *out, u32 *out_len); -#else -#define do_nrv2b_compress compress_impossible -#endif
void uncompress_impossible(char *, char *, u32); void do_no_uncompress(char *, char *, u32); -#ifdef CONFIG_COMPRESSION_LZMA void do_lzma_uncompress(char *, char *, u32); -#else -#define do_lzma_uncompress uncompress_impossible -#endif -#ifdef CONFIG_COMPRESSION_NRV2B void do_nrv2b_uncompress(char *, char *, u32); -#else -#define do_nrv2b_uncompress uncompress_impossible -#endif
static compress_func compress_functions[] = { do_no_compress,
Modified: LinuxBIOSv3/util/nrv2b/nrv2b.c =================================================================== --- LinuxBIOSv3/util/nrv2b/nrv2b.c 2007-08-19 17:21:20 UTC (rev 468) +++ LinuxBIOSv3/util/nrv2b/nrv2b.c 2007-08-19 22:58:42 UTC (rev 469) @@ -1304,7 +1304,7 @@ #endif
#ifdef COMPACT -void do_nrv2b_compress(char* in, unsigned long in_len, char* out, unsigned long* out_len) { +void do_nrv2b_compress(uint8_t *in, unsigned long in_len, uint8_t *out, unsigned long *out_len) { *out_len = in_len + (in_len/8) + 256; out = malloc(*out_len); ucl_nrv2b_99_compress(in, in_len, out, out_len, 0 ); @@ -1346,7 +1346,7 @@ #endif
#ifdef COMPACT -void do_nrv2b_uncompress(char* dst, char* src, unsigned long len) { +void do_nrv2b_uncompress(uint8_t *dst, uint8_t *src, unsigned long len) { unsigned long ilen = 0, olen = 0, last_m_off = 1; uint32_t bb = 0; unsigned bc = 0;