CBFS stuff:

[coreboot.git] / src / lib / cbfs.c

diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index caf5db4b49e1848dc7773c916c0a5ebeafa3f508..5a8b5f776247be6407f3397d7a34eb77be4a7d20 100644 (file)
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -29,8 +29,6 @@
 #define ntohl(x) (x)
 #endif
 
-int run_address(void *f);
-
 int cbfs_decompress(int algo, void *src, void *dst, int len)
 {
        switch(algo) {
@@ -44,15 +42,6 @@ int cbfs_decompress(int algo, void *src, void *dst, int len)
        }
                return 0;
 
-#if CONFIG_COMPRESSED_PAYLOAD_NRV2B==1
-       case CBFS_COMPRESS_NRV2B: {
-               unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p);
-               unsigned long tmp;
-
-               unrv2b(src, dst, &tmp);
-       }
-               return 0;
-#endif
        default:
                printk_info( "CBFS:  Unknown compression type %d\n",
                       algo);
@@ -70,16 +59,16 @@ struct cbfs_header *cbfs_master_header(void)
        struct cbfs_header *header;
 
        void *ptr = (void *)*((unsigned long *) CBFS_HEADPTR_ADDR);
-       printk_debug("Check CBFS header at %p\n", ptr);
+       printk_spew("Check CBFS header at %p\n", ptr);
        header = (struct cbfs_header *) ptr;
 
-       printk_debug("magic is %08x\n", ntohl(header->magic));
+       printk_spew("magic is %08x\n", ntohl(header->magic));
        if (ntohl(header->magic) != CBFS_HEADER_MAGIC) {
-               printk_err("NO CBFS HEADER\n");
+               printk_err("ERROR: No valid CBFS header found!\n");
                return NULL;
        }
 
-       printk_debug("Found CBFS header at %p\n", ptr);
+       printk_spew("Found CBFS header at %p\n", ptr);
        return header;
 }
 
@@ -97,17 +86,17 @@ struct cbfs_file *cbfs_find(const char *name)
        while(1) {
                struct cbfs_file *file = (struct cbfs_file *) offset;
                if (!cbfs_check_magic(file)) return NULL;
-               printk_info("Check %s\n", CBFS_NAME(file));
+               printk_debug("Check %s\n", CBFS_NAME(file));
                if (!strcmp(CBFS_NAME(file), name))
                        return file;
 
                int flen = ntohl(file->len);
                int foffset = ntohl(file->offset);
-               printk_spew("CBFS: follow chain: %p + %x + %x + align -> ", offset, foffset, flen);
+               printk_spew("CBFS: follow chain: %p + %x + %x + align -> ", (void *)offset, foffset, flen);
 
                unsigned long oldoffset = offset;
                offset = ALIGN(offset + foffset + flen, align);
-               printk_spew("%p\n", offset);
+               printk_spew("%p\n", (void *)offset);
                if (offset <= oldoffset) return NULL;
 
                if (offset < 0xFFFFFFFF - ntohl(header->romsize))
@@ -182,7 +171,8 @@ void * cbfs_load_stage(const char *name)
        if (stage == NULL)
                return (void *) -1;
 
-       printk_info("Stage: load @ %d/%d bytes, enter @ %llx\n", 
+       printk_info("Stage: load %s @ %d/%d bytes, enter @ %llx\n", 
+                       name,
                        (u32) stage->load, stage->memlen, 
                        stage->entry);
        memset((void *) (u32) stage->load, 0, stage->memlen);