Author: stepan Date: 2009-04-22 01:02:40 +0200 (Wed, 22 Apr 2009) New Revision: 4160
Modified: trunk/coreboot-v2/src/stream/rom_stream.c Log: remove a few warnings, and comments ?\195?\131?\194?\161 la #include <foo.h> // include file foo.h (trivial) Signed-off-by: Stefan Reinauer stepan@coresystems.de Acked-by: Stefan Reinauer stepan@coresystems.de
Modified: trunk/coreboot-v2/src/stream/rom_stream.c =================================================================== --- trunk/coreboot-v2/src/stream/rom_stream.c 2009-04-21 23:01:10 UTC (rev 4159) +++ trunk/coreboot-v2/src/stream/rom_stream.c 2009-04-21 23:02:40 UTC (rev 4160) @@ -17,16 +17,14 @@
#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B) #define HAVE_UNCOMPRESSER 1 -// include generic nrv2b #include "../lib/nrv2b.c" #endif
#if (CONFIG_COMPRESSED_PAYLOAD_LZMA) #if HAVE_UNCOMPRESSER -#error "You're defining more than one compression type, which is not allowed (of course)" +#error "You're defining more than one compression type, which is not allowed." #endif #define HAVE_UNCOMPRESSER 1 -// include generic lzma #include "../lib/lzma.c" #endif
@@ -43,13 +41,13 @@ */
/*XXXXXXXXXXXXXX */ -/*static const */unsigned char *rom_start = (unsigned char *)CONFIG_ROM_PAYLOAD_START; -/*static const */unsigned char *rom_end = (unsigned char *)(CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE - 1); +unsigned char *rom_start = (unsigned char *)CONFIG_ROM_PAYLOAD_START; +unsigned char *rom_end = (unsigned char *)(CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE - 1); /*XXXXXXXXXXXXXX */
static const unsigned char *rom;
-#if UNCOMPRESSER +#ifdef UNCOMPRESSER unsigned long uncompress(uint8_t * rom_start, uint8_t *dest ) { @@ -64,7 +62,7 @@ #endif int stream_init(void) { -#if (UNCOMPRESSER) +#ifdef UNCOMPRESSER unsigned char *dest; unsigned long olen; #endif @@ -73,7 +71,7 @@ (unsigned long)rom_start, (unsigned long)rom_end);
-#if (UNCOMPRESSER) +#ifdef UNCOMPRESSER
dest = &_eheap; /* need a good address on RAM */