diff options
| author | Ronald G. Minnich <rminnich@gmail.com> | 2009-04-24 06:32:29 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-04-24 06:32:29 +0000 |
| commit | 7d0ff4c12623300886516edae6e124c950be3c86 (patch) | |
| tree | fc3ec1e200ba57deca0c462cf57b953813d199a5 | |
| parent | cec6dc4c15f7c2bb7c245c76e61f2ee41c3fa649 (diff) | |
| download | coreboot-7d0ff4c12623300886516edae6e124c950be3c86.tar.xz | |
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
| -rw-r--r-- | src/boot/selfboot.c | 2 | ||||
| -rw-r--r-- | src/lib/cbfs.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/boot/selfboot.c b/src/boot/selfboot.c index c7b927f15b..09b3ea360d 100644 --- a/src/boot/selfboot.c +++ b/src/boot/selfboot.c @@ -94,6 +94,7 @@ int cbfs_self_decompress(int algo, void *src,struct segment *new) case CBFS_COMPRESS_LZMA: { unsigned long ulzma(unsigned char *src, unsigned char *dst); ulzma(src, dst); + break; } #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 tmp; unrv2b(src, dst, &tmp); + break; } #endif default: diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index 55a84b5d93..11098b6b86 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -39,7 +39,7 @@ int cbfs_decompress(int algo, void *src, void *dst, int len) memcpy(dst, src, len); return 0; -#ifdef CONFIG_COMPRESSION_LZMA +#if CONFIG_COMPRESSED_PAYLOAD_LZMA==1 case CBFS_COMPRESS_LZMA: { 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; #endif -#ifdef CONFIG_COMPRESSION_NRV2B +#if CONFIG_COMPRESSED_PAYLOAD_NRV2B==1 case CBFS_COMPRESS_NRV2B: { unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p); unsigned long tmp; |