New patch to review for coreboot: e0b0bb7 cbfstool: Use cbfs_image API for "remove" command.
Hung-Te Lin (hungte@chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2208
-gerrit
commit e0b0bb79e1129ccea3429bd6ac730321b06fbde7 Author: Hung-Te Lin hungte@chromium.org Date: Tue Jan 29 02:38:40 2013 +0800
cbfstool: Use cbfs_image API for "remove" command.
To delete a component from existing CBFS ROM image.
To test: cbfstool coreboot.rom remove -n fallback/romstage # and compare with old cbfstool output result.
Change-Id: If39ef9be0b34d8e3df77afb6c9f944e02f08bc4e Signed-off-by: Hung-Te Lin hungte@chromium.org --- util/cbfstool/cbfs_image.c | 30 ++++++++++++++++++++++++++++++ util/cbfstool/cbfs_image.h | 3 +++ util/cbfstool/cbfstool.c | 21 ++++++++++----------- 3 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 4e2c8a9..24759c9 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -97,6 +97,13 @@ uint32_t get_cbfs_compression(const char *name, uint32_t unknown) { return lookup_type_by_name(types_cbfs_compression, name, unknown); }
+/* CBFS image */ + +static int cbfs_calculate_file_header_size(const char *name) { + return (sizeof(struct cbfs_file) + + align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN)); +} + int cbfs_image_from_file(struct cbfs_image *image, const char *filename) { if (buffer_from_file(&image->buffer, filename) != 0) return -1; @@ -165,6 +172,29 @@ int cbfs_export_entry(struct cbfs_image *image, const char *entry_name, return 0; }
+int cbfs_remove_entry(struct cbfs_image *image, const char *name) { + struct cbfs_file *entry, *next; + size_t len; + entry = cbfs_get_entry(image, name); + if (!entry) { + ERROR("CBFS file %s not found.\n", name); + return -1; + } + next = cbfs_find_next_entry(image, entry); + assert(next); + DEBUG("cbfs_remove_entry: Removed %s @ 0x%x\n", + CBFS_NAME(entry), cbfs_get_entry_addr(image, entry)); + entry->type = htonl(CBFS_COMPONENT_DELETED); + len = (cbfs_get_entry_addr(image, next) - + cbfs_get_entry_addr(image, entry)); + entry->offset = htonl(cbfs_calculate_file_header_size("")); + entry->len = htonl(len - ntohl(entry->offset)); + memset(CBFS_NAME(entry), 0, ntohl(entry->offset) - sizeof(*entry)); + memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, + ntohl(entry->len)); + return 0; +} + int cbfs_print_header_info(struct cbfs_image *image) { assert(image && image->header); printf("%s: %zd kB, bootblocksize %d, romsize %d, offset 0x%x\n" diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 1be2a66..e9f64a4 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -46,6 +46,9 @@ struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name); int cbfs_export_entry(struct cbfs_image *image, const char *entry_name, const char *filename);
+/* Removes an entry from CBFS image. Returns 0 on success, otherwise non-zero. */ +int cbfs_remove_entry(struct cbfs_image *image, const char *name); + /* Callback function used by cbfs_walk. * Returns 0 on success, or non-zero to stop further iteration. */ typedef int (*cbfs_entry_callback)(struct cbfs_image *image, diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 4a44005..caf9942 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -313,34 +313,33 @@ static int cbfs_add_flat_binary(void)
static int cbfs_remove(void) { - void *rom; + int result = 1; + struct cbfs_image image;
if (!param.name) { ERROR("You need to specify -n/--name.\n"); return 1; }
- rom = loadrom(param.cbfs_name); - if (rom == NULL) { + if (cbfs_image_from_file(&image, param.cbfs_name) != 0) { ERROR("Could not load ROM image '%s'.\n", param.cbfs_name); return 1; }
- if (remove_file_from_cbfs(param.name)) { + if (cbfs_remove_entry(&image, param.name) != 0) { ERROR("Removing file '%s' failed.\n", - param.name); - free(rom); + param.name); + cbfs_image_delete(&image); return 1; } - - if (writerom(param.cbfs_name, rom, romsize)) { - free(rom); + if (cbfs_image_write_file(&image, param.cbfs_name) != 0) { + cbfs_image_delete(&image); return 1; }
- free(rom); - return 0; + cbfs_image_delete(&image); + return result; }
static int cbfs_create(void)
-
Hung-Te Lin