diff options
author | Ronald G. Minnich <rminnich@gmail.com> | 2006-05-18 03:07:16 +0000 |
---|---|---|
committer | Ronald G. Minnich <rminnich@gmail.com> | 2006-05-18 03:07:16 +0000 |
commit | bad9d105cf908bbb032768a1605265654b38ca3a (patch) | |
tree | 264093bd7636f621345cc232d0dbbf2a003f9c56 /src/stream/rom_stream.c | |
parent | 5d573c28e7520085ff7b687c05834292d615860a (diff) |
cleanup some of the compressed rom stream ugliness -- more to do!
olpc and rumba can now boot linux out of flash. vsa was resized to 64K.
olpc and rumba now used compressed payload -- thanks stefan!
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2307 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/stream/rom_stream.c')
-rw-r--r-- | src/stream/rom_stream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/stream/rom_stream.c b/src/stream/rom_stream.c index c9f2fa3f4d..e5a55d306d 100644 --- a/src/stream/rom_stream.c +++ b/src/stream/rom_stream.c @@ -32,7 +32,7 @@ static const unsigned char *rom; int stream_init(void) { #if CONFIG_COMPRESSED_ROM_STREAM - unsigned long dest; + unsigned char *dest; unsigned long olen; #endif @@ -51,14 +51,14 @@ int stream_init(void) dest = (CONFIG_LB_MEM_TOPK<<10); } #endif - if((dest < 0xf0000) && ((dest+olen)>0xf0000)) { //linuxbios tables etc - dest = (CONFIG_LB_MEM_TOPK<<10); + if((dest < (unsigned char *) 0xf0000) && ((dest+olen)> (unsigned char *)0xf0000)) { //linuxbios tables etc + dest = (unsigned char *) (CONFIG_LB_MEM_TOPK<<10); } #endif printk_debug("Uncompressing to RAM 0x%08lx ", dest); olen = unrv2b((uint8_t *) rom_start, (uint8_t *)dest ); - printk_debug(" ilen = 0x%08lx olen = 0x%08lx done.\n", ilen, olen); + printk_debug(" olen = 0x%08lx done.\n", olen); rom_end = dest + olen - 1; rom = dest; #else |