Emulation/switch-coreboot
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-coreboot.git synced 2025-05-04 01:39:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always compile in all compression algorithms. This is required for

Browse source 
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>



git-svn-id: svn://coreboot.org/repository/LinuxBIOSv3@469 f3766cd6-281f-0410-b1cd-43a5c92072e9
This commit is contained in:
Stefan Reinauer 2007-08-19 22:58:42 +00:00
parent c4f05ee85c
commit e8f3a26b44
3 changed files with 3 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
util/lar/Makefile
View file

@ -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 @@ LAROBJ := lar.o create.o extract.o list.o lib.o bootblock.o
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))

16
util/lar/lar.h
View file

@ -78,29 +78,13 @@ typedef void (*uncompress_func) (char *, char *, u32);
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,

4
util/nrv2b/nrv2b.c
View file

@ -1304,7 +1304,7 @@ void Encode(void) /* compression */
#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 @@ void do_nrv2b_compress(char* in, unsigned long in_len, char* out, unsigned long*
#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;