From f64893a94ffb2b7d79364736fc10aebe9bd9176e Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Thu, 23 Jul 2009 22:03:14 +0000 Subject: CBFS stuff: - update, add, and improve comments - whitespace here and there - remove unused or write-only variables - improve debug output - only build payload.{nrv2b,lzma} for non-cbfs - improved error checking in cbfstool Signed-off-by: Stefan Reinauer Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4466 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/cbfstool/fs.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) (limited to 'util') diff --git a/util/cbfstool/fs.c b/util/cbfstool/fs.c index 1e4f06907a..611b8fc673 100644 --- a/util/cbfstool/fs.c +++ b/util/cbfstool/fs.c @@ -312,6 +312,29 @@ struct cbfs_file *rom_find_next(struct rom *rom, struct cbfs_file *prev) ntohl(rom->header->align))); } +struct cbfs_file *rom_find_empty(struct rom *rom) +{ + unsigned int offset = ntohl(rom->header->offset); + unsigned int ret = ntohl(rom->header->offset); + + while (offset < rom->fssize) { + + struct cbfs_file *c = + (struct cbfs_file *)ROM_PTR(rom, offset); + + if (!strcmp(c->magic, COMPONENT_MAGIC)) { + offset += ALIGN(ntohl(c->offset) + ntohl(c->len), + ntohl(rom->header->align)); + + ret = offset; + } else + offset += ntohl(rom->header->align); + } + + return (ret < rom->fssize) ? + (struct cbfs_file *)ROM_PTR(rom, ret) : NULL; +} + struct cbfs_file *rom_find_by_name(struct rom *rom, const char *name) { struct cbfs_file *c = rom_find_first(rom); @@ -363,6 +386,24 @@ int rom_remove(struct rom *rom, const char *name) c->type = CBFS_COMPONENT_DELETED; + void *n = rom_find_next(rom, c); + int clear; + + if (n != NULL) { + memcpy(c, n, rom->fssize - ROM_OFFSET(rom, n)); + clear = ROM_OFFSET(rom, n) - ROM_OFFSET(rom, c); + } + else { /* No component after this one. */ + unsigned int csize; + csize = sizeof(struct cbfs_file) + ALIGN(strlen(name) + 1, 16); + clear = ntohl(c->len) + csize; + memcpy(c, ((void*)c) + clear, + rom->fssize - (ROM_OFFSET(rom, c)+clear)); + } + + /* Zero the new space, which is always at the end. */ + memset(ROM_PTR(rom, rom->fssize - clear), 0, clear); + return 0; } @@ -394,6 +435,7 @@ int rom_extract(struct rom *rom, const char *name, void** buf, int *size ) int rom_add(struct rom *rom, const char *name, void *buffer, unsigned long address, int size, int type) { struct cbfs_file *c; + int csize; if (rom_find_by_name(rom, name)) { ERROR("Component %s already exists in this rom\n", name); @@ -410,7 +452,28 @@ int rom_add(struct rom *rom, const char *name, void *buffer, unsigned long addre return -1; } - memcpy(((unsigned char *)c) + ntohl(c->offset), buffer, size); + csize = sizeof(struct cbfs_file) + ALIGN(strlen(name) + 1, 16); + + int offset = ROM_OFFSET(rom, c); + + if (offset + csize + size > rom->fssize) { + ERROR("There is not enough room in this ROM for this\n"); + ERROR("component. I need %d bytes, only have %d bytes avail\n", + csize + size, rom->fssize - offset); + + return -1; + } + + strcpy(c->magic, COMPONENT_MAGIC); + + c->len = htonl(size); + c->offset = htonl(csize); + c->type = htonl(type); + + memset(CBFS_NAME(c), 0, ALIGN(strlen(name) + 1, 16)); + strcpy((char *)CBFS_NAME(c), name); + + memcpy(((unsigned char *)c) + csize, buffer, size); return 0; } -- cgit v1.2.3