Author: oxygene Date: 2009-04-24 08:32:29 +0200 (Fri, 24 Apr 2009) New Revision: 4203
Modified: trunk/coreboot-v2/src/boot/selfboot.c trunk/coreboot-v2/src/lib/cbfs.c Log: 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 <[email protected]> Acked-by: Myles Watson <[email protected]> Modified: trunk/coreboot-v2/src/boot/selfboot.c =================================================================== --- trunk/coreboot-v2/src/boot/selfboot.c 2009-04-24 06:28:48 UTC (rev 4202) +++ trunk/coreboot-v2/src/boot/selfboot.c 2009-04-24 06:32:29 UTC (rev 4203) @@ -94,6 +94,7 @@ case CBFS_COMPRESS_LZMA: { unsigned long ulzma(unsigned char *src, unsigned char *dst); ulzma(src, dst); + break; } #endif @@ -102,6 +103,7 @@ unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p); unsigned long tmp; unrv2b(src, dst, &tmp); + break; } #endif default: Modified: trunk/coreboot-v2/src/lib/cbfs.c =================================================================== --- trunk/coreboot-v2/src/lib/cbfs.c 2009-04-24 06:28:48 UTC (rev 4202) +++ trunk/coreboot-v2/src/lib/cbfs.c 2009-04-24 06:32:29 UTC (rev 4203) @@ -39,7 +39,7 @@ 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 @@ 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; -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
