#include "cbfs.h"
#include "elf.h"
-#define dprintf
+#define dprintf(x...)
uint32_t getfilesize(const char *filename)
{
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?
{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"}
};
}
}
+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;
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));
return 1;
}
+
+static struct cbfs_file *merge_adjacent_files(struct cbfs_file *first,
+ struct cbfs_file *second)
+{
+ uint32_t new_length =
+ ntohl(first->len) + ntohl(second->len) + ntohl(second->offset);
+ first->len = htonl(new_length);
+ first->checksum = 0; // FIXME?
+ return first;
+}
+
+static struct cbfs_file *next_file(struct cbfs_file *prev)
+{
+ uint32_t pos = (prev == NULL) ? phys_start :
+ ALIGN(virt_to_phys(prev) + ntohl(prev->len) + ntohl(prev->offset),
+ align);
+
+ for (; pos < phys_end; pos += align) {
+ if (cbfs_file_header(pos))
+ return (struct cbfs_file *)phys_to_virt(pos);
+ }
+ return NULL;
+}
+
+
+int remove_file_from_cbfs(const char *filename)
+{
+ struct cbfs_file *prev = NULL;
+ struct cbfs_file *cur = next_file(prev);
+ struct cbfs_file *next = next_file(cur);
+ for (; cur; prev = cur, cur = next, next = next_file(next)) {
+
+ /* Check if this is the file to remove. */
+ char *name = (char *)cur + sizeof(*cur);
+ if (strcmp(name, filename))
+ continue;
+
+ /* Mark the file as free space and erase its name. */
+ cur->type = CBFS_COMPONENT_NULL;
+ name[0] = '\0';
+
+ /* Merge it with the previous file if possible. */
+ if (prev && prev->type == CBFS_COMPONENT_NULL)
+ cur = merge_adjacent_files(prev, cur);
+
+ /* Merge it with the next file if possible. */
+ if (next && next->type == CBFS_COMPONENT_NULL)
+ merge_adjacent_files(cur, next);
+
+ return 0;
+ }
+ printf("CBFS file %s not found.\n", filename);
+ return 1;
+}
+
+
/* returns new data block with cbfs_file header, suitable to dump into the ROM. location returns
the new location that points to the cbfs_file header */
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?
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);
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 =
projects / coreboot.git / blobdiff