Enable -Werror for romcc

[coreboot.git] / util / cbfstool / common.c

diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index 8478c5a492cc69005dc6acdc593db6fc9f4609ef..df744217d493fabe145a8b5e7cb7dc09a0ea984b 100644 (file)
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -26,7 +26,7 @@
 #include "cbfs.h"
 #include "elf.h"
 
-#define dprintf
+#define dprintf(x...)
 
 uint32_t getfilesize(const char *filename)
 {
@@ -118,7 +118,7 @@ int cbfs_file_header(uint32_t physaddr)
 struct cbfs_file *cbfs_create_empty_file(uint32_t physaddr, uint32_t size)
 {
        struct cbfs_file *nextfile = (struct cbfs_file *)phys_to_virt(physaddr);
-       strncpy(nextfile->magic, "LARCHIVE", 8);
+       strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
        nextfile->len = htonl(size);
        nextfile->type = htonl(0xffffffff);
        nextfile->checksum = 0; // FIXME?
@@ -145,6 +145,7 @@ struct filetypes_t {
        {CBFS_COMPONENT_VSA, "vsa"},
        {CBFS_COMPONENT_MBI, "mbi"},
        {CBFS_COMPONENT_MICROCODE, "microcode"},
+       {CBFS_COMPONENT_CMOS_DEFAULT, "cmos default"},
        {CBFS_COMPONENT_DELETED, "deleted"},
        {CBFS_COMPONENT_NULL, "null"}
 };
@@ -207,6 +208,71 @@ void print_cbfs_directory(const char *filename)
        }
 }
 
+int extract_file_from_cbfs(const char *filename, const char *payloadname, const char *outpath)
+{
+       // Identify the coreboot image.
+       printf(
+            "%s: %d kB, bootblocksize %d, romsize %d, offset 0x%x\nAlignment: %d bytes\n\n",
+            basename((char *)filename), romsize / 1024, ntohl(master_header->bootblocksize),
+            romsize, ntohl(master_header->offset), align);
+
+       FILE *outfile = NULL;
+       uint32_t current = phys_start;
+       while (current < phys_end) {
+               if (!cbfs_file_header(current)) {
+                       current += align;
+                       continue;
+               }
+
+               // Locate the file start struct
+               struct cbfs_file *thisfile =
+                   (struct cbfs_file *)phys_to_virt(current);
+               // And its length
+               uint32_t length = ntohl(thisfile->len);
+               // Locate the file name
+               char *fname = (char *)(phys_to_virt(current) + sizeof(struct cbfs_file));
+
+               // It's not the file we are looking for..
+               if (strcmp(fname, payloadname) != 0)
+               {
+                       current =
+                          ALIGN(current + ntohl(thisfile->len) +
+                                 ntohl(thisfile->offset), align);
+                       continue;
+               }
+
+               // Else, it's our file.
+               printf("Found file %.30s at 0x%x, type %.12s, size %d\n", fname,
+                      current - phys_start, strfiletype(ntohl(thisfile->type)),
+                      length);
+
+               // If we are not dumping to stdout, open the out file.
+               outfile = fopen(outpath, "wb");
+               if (!outfile)
+               {
+                       printf("Could not open the file %s for writing. Aborting.\n", outpath);
+                       return 1;
+               }
+
+               if (ntohl(thisfile->type) != CBFS_COMPONENT_RAW)
+               {
+                       printf("Warning: only 'raw' files are safe to extract.\n");
+               }
+
+               fwrite(((char *)thisfile)
+                               + ntohl(thisfile->offset), length, 1, outfile);
+
+               fclose(outfile);
+               printf("Successfully dumped the file.\n");
+
+               // We'll only dump one file.
+               return 0;
+       }
+       printf("File %s not found.\n", payloadname);
+       return 1;
+}
+
+
 int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location)
 {
        uint32_t current = phys_start;
@@ -268,8 +334,7 @@ int add_file_to_cbfs(void *content, uint32_t contentsize, uint32_t location)
                                        thisfile->len =
                                            htonl(location - current -
                                                  ntohl(thisfile->offset));
-                                       struct cbfs_file *nextfile =
-                                           cbfs_create_empty_file(location,
+                                       cbfs_create_empty_file(location,
                                                                   length -
                                                                   (location -
                                                                    current));
@@ -312,7 +377,7 @@ void *create_cbfs_file(const char *filename, void *data, uint32_t * datasize,
        }
        memset(newdata, 0xff, *datasize + headersize);
        struct cbfs_file *nextfile = (struct cbfs_file *)newdata;
-       strncpy(nextfile->magic, "LARCHIVE", 8);
+       strncpy((char *)(nextfile->magic), "LARCHIVE", 8);
        nextfile->len = htonl(*datasize);
        nextfile->type = htonl(type);
        nextfile->checksum = 0; // FIXME?
@@ -357,8 +422,7 @@ int create_cbfs_image(const char *romfile, uint32_t _romsize,
 
        recalculate_rom_geometry(romarea);
 
-       struct cbfs_file *one_empty_file =
-           cbfs_create_empty_file((0 - romsize) & 0xffffffff,
+       cbfs_create_empty_file((0 - romsize) & 0xffffffff,
                                   romsize - bootblocksize -
                                   sizeof(struct cbfs_header) -
                                   sizeof(struct cbfs_file) - 16);
@@ -375,7 +439,7 @@ static int in_segment(int addr, int size, int gran)
 uint32_t cbfs_find_location(const char *romfile, uint32_t filesize,
                            const char *filename, uint32_t alignment)
 {
-       void *rom = loadrom(romfile);
+       loadrom(romfile);
        int filename_size = strlen(filename);
 
        int headersize =