diff options
| author | Ed Swierk <eswierk@arastra.com> | 2006-12-15 11:42:16 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2006-12-15 11:42:16 +0000 |
| commit | 1a7a5b49c570bf4a183178327c77ed4828d25416 (patch) | |
| tree | 06d3735939cb943609743ea402b2ab1bfdaa72b3 /src/stream/serial_stream.c | |
| parent | 208948787ec767dcdd2443a89f312bfba00ea2cc (diff) | |
| download | coreboot-1a7a5b49c570bf4a183178327c77ed4828d25416.tar.xz | |
Apply linuxbios-rename-compressed-payload-options.patch, refs #14
Signed-off-by: Ed Swierk <eswierk@arastra.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2527 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/stream/serial_stream.c')
| -rw-r--r-- | src/stream/serial_stream.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/stream/serial_stream.c b/src/stream/serial_stream.c index b3af26b1db..5be6624ac4 100644 --- a/src/stream/serial_stream.c +++ b/src/stream/serial_stream.c @@ -5,16 +5,16 @@ #include <string.h> /* if they set the precompressed rom stream, they better have set a type */ -#if CONFIG_PRECOMPRESSED_ROM_STREAM && ((!CONFIG_COMPRESSED_ROM_STREAM) && (!CONFIG_COMPRESSED_ROM_STREAM_NRV2B) && (!CONFIG_COMPRESSED_ROM_STREAM_LZMA)) -#error "You set CONFIG_PRECOMPRESSED_ROM_STREAM but need to set CONFIG_COMPRESSED_ROM_STREAM (implies NRV2B, deprecated) or CONFIG_COMPRESSED_ROM_STREAM_NRV2B or CONFIG_COMPRESSED_ROM_STREAM_LZMA" +#if CONFIG_PRECOMPRESSED_PAYLOAD && ((!CONFIG_COMPRESSED_PAYLOAD_NRV2B) && (!CONFIG_COMPRESSED_PAYLOAD_LZMA)) +#error "You set CONFIG_PRECOMPRESSED_PAYLOAD but need to set CONFIG_COMPRESSED_PAYLOAD_NRV2B or CONFIG_COMPRESSED_PAYLOAD_LZMA" #endif -#if (CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B) +#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B) #define HAVE_UNCOMPRESSER 1 #include "../lib/nrv2b.c" #endif -#if (CONFIG_COMPRESSED_ROM_STREAM_LZMA) +#if (CONFIG_COMPRESSED_PAYLOAD_LZMA) #if HAVE_UNCOMPRESSER #error "You're defining more than one compression type, which is not allowed (of course)" #endif @@ -33,11 +33,11 @@ static int stream_max_bytes = 0x00800000; #if HAVE_UNCOMPRESSER static unsigned long uncompress(uint8_t *src, uint8_t *dest) { -#if (CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B) +#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B) unsigned long ilen; return unrv2b(src, dest, &ilen); #endif -#if (CONFIG_COMPRESSED_ROM_STREAM_LZMA) +#if (CONFIG_COMPRESSED_PAYLOAD_LZMA) return ulzma(src, dest); #endif } |