diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-05-27 14:19:31 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-05-27 14:19:31 +0000 |
| commit | a034dca42cc1638e4917e38b98e7dc6b434f2357 (patch) | |
| tree | 2050fd887fff8d644260cf0168efc5272ce56d24 /src/lib/cbfs.c | |
| parent | 8341f44f98ad6fe8760d348e7c3cca8f49eb2557 (diff) | |
Move coreboot_ram and coreboot_apc to CBFS. This allows to
reduce the size of the bootblock (done for kontron/986lcd-m)
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4315 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/lib/cbfs.c')
| -rw-r--r-- | src/lib/cbfs.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index b5fb9b15eb..caf5db4b49 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -38,14 +38,11 @@ int cbfs_decompress(int algo, void *src, void *dst, int len) memcpy(dst, src, len); return 0; -#if CONFIG_COMPRESSED_PAYLOAD_LZMA==1 - case CBFS_COMPRESS_LZMA: { unsigned long ulzma(unsigned char *src, unsigned char *dst); ulzma(src, dst); } return 0; -#endif #if CONFIG_COMPRESSED_PAYLOAD_NRV2B==1 case CBFS_COMPRESS_NRV2B: { @@ -186,16 +183,17 @@ void * cbfs_load_stage(const char *name) return (void *) -1; printk_info("Stage: load @ %d/%d bytes, enter @ %llx\n", - ntohl((u32) stage->load), ntohl(stage->memlen), + (u32) stage->load, stage->memlen, stage->entry); - memset((void *) ntohl((u32) stage->load), 0, ntohl(stage->memlen)); + memset((void *) (u32) stage->load, 0, stage->memlen); - if (cbfs_decompress(ntohl(stage->compression), + if (cbfs_decompress(stage->compression, ((unsigned char *) stage) + sizeof(struct cbfs_stage), - (void *) ntohl((u32) stage->load), - ntohl(stage->len))) + (void *) (u32) stage->load, + stage->len)) return (void *) -1; + printk_info("Stage: done loading.\n"); entry = stage->entry; // return (void *) ntohl((u32) stage->entry); |