summaryrefslogtreecommitdiff
path: root/src/stream/rom_stream.c
diff options
context:
space:
mode:
authorEd Swierk <eswierk@arastra.com>2006-12-15 11:42:16 +0000
committerStefan Reinauer <stepan@openbios.org>2006-12-15 11:42:16 +0000
commit1a7a5b49c570bf4a183178327c77ed4828d25416 (patch)
tree06d3735939cb943609743ea402b2ab1bfdaa72b3 /src/stream/rom_stream.c
parent208948787ec767dcdd2443a89f312bfba00ea2cc (diff)
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/rom_stream.c')
-rw-r--r--src/stream/rom_stream.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/stream/rom_stream.c b/src/stream/rom_stream.c
index 5e5a1ed66d..2000c5f576 100644
--- a/src/stream/rom_stream.c
+++ b/src/stream/rom_stream.c
@@ -5,23 +5,23 @@
#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 they set ANY of these, then we're compressed */
-#if ((CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B) || (CONFIG_COMPRESSED_ROM_STREAM_LZMA))
+#if ((CONFIG_COMPRESSED_PAYLOAD_NRV2B) || (CONFIG_COMPRESSED_PAYLOAD_LZMA))
#define UNCOMPRESSER 1
extern unsigned char _heap, _eheap;
#endif
-#if (CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B)
+#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B)
#define HAVE_UNCOMPRESSER 1
// include generic nrv2b
#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
@@ -53,11 +53,11 @@ static const unsigned char *rom;
unsigned long
uncompress(uint8_t * rom_start, uint8_t *dest )
{
-#if (CONFIG_COMPRESSED_ROM_STREAM) || (CONFIG_COMPRESSED_ROM_STREAM_NRV2B)
+#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B)
unsigned long ilen; // used compressed stream length
return unrv2b(rom_start, dest, &ilen);
#endif
-#if (CONFIG_COMPRESSED_ROM_STREAM_LZMA)
+#if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
return ulzma(rom_start, dest);
#endif
}