GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

These are some really horrible bugs that got through. 

(and, for the record: no more #ifdef in coreboot. We're not going to
have this happen again. If we do have it in v2, let's remove it.)

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4203 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Ronald G. Minnich 2009-04-24 06:32:29 +00:00 committed by Patrick Georgi
parent cec6dc4c15
commit 7d0ff4c126
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/boot/selfboot.c
View File

@ -94,6 +94,7 @@ int cbfs_self_decompress(int algo, void *src,struct segment *new)
case CBFS_COMPRESS_LZMA: { case CBFS_COMPRESS_LZMA: {
unsigned long ulzma(unsigned char *src, unsigned char *dst); unsigned long ulzma(unsigned char *src, unsigned char *dst);
ulzma(src, dst); ulzma(src, dst);
break;
} }
#endif #endif
@ -102,6 +103,7 @@ int cbfs_self_decompress(int algo, void *src,struct segment *new)
unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p); unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p);
unsigned long tmp; unsigned long tmp;
unrv2b(src, dst, &tmp); unrv2b(src, dst, &tmp);
break;
} }
#endif #endif
default: default:

4
src/lib/cbfs.c
View File

@ -39,7 +39,7 @@ int cbfs_decompress(int algo, void *src, void *dst, int len)
memcpy(dst, src, len); memcpy(dst, src, len);
return 0; return 0;
#ifdef CONFIG_COMPRESSION_LZMA #if CONFIG_COMPRESSED_PAYLOAD_LZMA==1
case CBFS_COMPRESS_LZMA: { case CBFS_COMPRESS_LZMA: {
unsigned long ulzma(unsigned char *src, unsigned char *dst); unsigned long ulzma(unsigned char *src, unsigned char *dst);
@ -48,7 +48,7 @@ int cbfs_decompress(int algo, void *src, void *dst, int len)
return 0; return 0;
#endif #endif
#ifdef CONFIG_COMPRESSION_NRV2B #if CONFIG_COMPRESSED_PAYLOAD_NRV2B==1
case CBFS_COMPRESS_NRV2B: { case CBFS_COMPRESS_NRV2B: {
unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p); unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p);
unsigned long tmp; unsigned long tmp;