YABEL update

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

diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index 5a8b5f776247be6407f3397d7a34eb77be4a7d20..0bb6e838fb9c63e5cd9e7c2821ba9638a191aa99 100644 (file)
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -21,13 +21,8 @@
 #include <string.h>
 #include <console/console.h>
 #include <cbfs.h>
-
-#ifndef CONFIG_BIG_ENDIAN
-#define ntohl(x) ( ((x&0xff)<<24) | ((x&0xff00)<<8) | \
-               ((x&0xff0000) >> 8) | ((x&0xff000000) >> 24) )
-#else
-#define ntohl(x) (x)
-#endif
+#include <lib.h>
+#include <arch/byteorder.h>
 
 int cbfs_decompress(int algo, void *src, void *dst, int len)
 {
@@ -36,15 +31,15 @@ int cbfs_decompress(int algo, void *src, void *dst, int len)
                memcpy(dst, src, len);
                return 0;
 
-       case CBFS_COMPRESS_LZMA: {
-               unsigned long ulzma(unsigned char *src, unsigned char *dst);
-               ulzma(src, dst);
-       }
+       case CBFS_COMPRESS_LZMA:
+               if (!ulzma(src, dst)) {
+                       printk_err("CBFS: LZMA decompression failed!\n");
+                       return -1;
+               }
                return 0;
 
        default:
-               printk_info( "CBFS:  Unknown compression type %d\n",
-                      algo);
+               printk_info( "CBFS:  Unknown compression type %d\n", algo);
                return -1;
        }
 }
@@ -65,6 +60,10 @@ struct cbfs_header *cbfs_master_header(void)
        printk_spew("magic is %08x\n", ntohl(header->magic));
        if (ntohl(header->magic) != CBFS_HEADER_MAGIC) {
                printk_err("ERROR: No valid CBFS header found!\n");
+               if (header->magic == 0xffffffff) {
+                       printk_err("Maybe the ROM isn't entirely mapped yet?\n"
+                               "See (and report to) http://www.coreboot.org/Infrastructure_Projects#CBFS\n");
+               }
                return NULL;
        }
 
@@ -86,7 +85,7 @@ 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_debug("Check %s\n", CBFS_NAME(file));
+               printk_spew("Check %s\n", CBFS_NAME(file));
                if (!strcmp(CBFS_NAME(file), name))
                        return file;
 
@@ -124,13 +123,27 @@ struct cbfs_stage *cbfs_find_file(const char *name, int type)
        return (void *) CBFS_SUBHEADER(file);
 }
 
+static int tohex4(unsigned int c)
+{
+       return (c<=9)?(c+'0'):(c-10+'a');
+}
+
+static void tohex16(unsigned int val, char* dest)
+{
+       dest[0]=tohex4(val>>12);
+       dest[1]=tohex4((val>>8) & 0xf);
+       dest[2]=tohex4((val>>4) & 0xf);
+       dest[3]=tohex4(val & 0xf);
+}
+
 void *cbfs_load_optionrom(u16 vendor, u16 device, void * dest)
 {
-       char name[17];
+       char name[17]="pciXXXX,XXXX.rom";
        struct cbfs_optionrom *orom;
        u8 *src;
 
-       sprintf(name,"pci%04x,%04x.rom", vendor, device);
+       tohex16(vendor, name+3);
+       tohex16(device, name+8);
 
        orom = (struct cbfs_optionrom *)
                cbfs_find_file(name, CBFS_TYPE_OPTIONROM);
@@ -171,7 +184,7 @@ void * cbfs_load_stage(const char *name)
        if (stage == NULL)
                return (void *) -1;
 
-       printk_info("Stage: load %s @ %d/%d bytes, enter @ %llx\n", 
+       printk_info("Stage: loading %s @ 0x%x (%d bytes), entry @ 0x%llx\n", 
                        name,
                        (u32) stage->load, stage->memlen, 
                        stage->entry);
@@ -183,16 +196,18 @@ void * cbfs_load_stage(const char *name)
                             (void *) (u32) stage->load,
                             stage->len))
                return (void *) -1;
-       printk_info("Stage: done loading.\n");
+
+       printk_debug("Stage: done loading.\n");
 
        entry = stage->entry;
-//     return (void *) ntohl((u32) stage->entry);
+       // entry = ntohl((u32) stage->entry);
+
        return (void *) entry;
 }
 
 void * cbfs_get_file(const char *name)
 {
-       return cbfs_find(name);
+       return (void *) cbfs_find(name);
 }
 
 int cbfs_execute_stage(const char *name)