remove a few warnings, and comments á la #include <foo.h> // include file foo.h

(trivial)
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4160 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer 2009-04-21 23:02:40 +00:00 committed by Stefan Reinauer
parent 4855f56df9
commit 6fa0317637
1 changed files with 6 additions and 8 deletions

View File

@ -17,16 +17,14 @@ extern unsigned char _heap, _eheap;
#if (CONFIG_COMPRESSED_PAYLOAD_NRV2B) #if (CONFIG_COMPRESSED_PAYLOAD_NRV2B)
#define HAVE_UNCOMPRESSER 1 #define HAVE_UNCOMPRESSER 1
// include generic nrv2b
#include "../lib/nrv2b.c" #include "../lib/nrv2b.c"
#endif #endif
#if (CONFIG_COMPRESSED_PAYLOAD_LZMA) #if (CONFIG_COMPRESSED_PAYLOAD_LZMA)
#if HAVE_UNCOMPRESSER #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 #endif
#define HAVE_UNCOMPRESSER 1 #define HAVE_UNCOMPRESSER 1
// include generic lzma
#include "../lib/lzma.c" #include "../lib/lzma.c"
#endif #endif
@ -43,13 +41,13 @@ extern unsigned char _heap, _eheap;
*/ */
/*XXXXXXXXXXXXXX */ /*XXXXXXXXXXXXXX */
/*static const */unsigned char *rom_start = (unsigned char *)CONFIG_ROM_PAYLOAD_START; 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_end = (unsigned char *)(CONFIG_ROM_PAYLOAD_START + PAYLOAD_SIZE - 1);
/*XXXXXXXXXXXXXX */ /*XXXXXXXXXXXXXX */
static const unsigned char *rom; static const unsigned char *rom;
#if UNCOMPRESSER #ifdef UNCOMPRESSER
unsigned long unsigned long
uncompress(uint8_t * rom_start, uint8_t *dest ) uncompress(uint8_t * rom_start, uint8_t *dest )
{ {
@ -64,7 +62,7 @@ uncompress(uint8_t * rom_start, uint8_t *dest )
#endif #endif
int stream_init(void) int stream_init(void)
{ {
#if (UNCOMPRESSER) #ifdef UNCOMPRESSER
unsigned char *dest; unsigned char *dest;
unsigned long olen; unsigned long olen;
#endif #endif
@ -73,7 +71,7 @@ int stream_init(void)
(unsigned long)rom_start, (unsigned long)rom_start,
(unsigned long)rom_end); (unsigned long)rom_end);
#if (UNCOMPRESSER) #ifdef UNCOMPRESSER
dest = &_eheap; /* need a good address on RAM */ dest = &_eheap; /* need a good address on RAM */