nvramtool: 64bit safe CBFS handling

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

diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index f017b2e2e07f3d58e2c1d938b0e4ba09edd0693b..9dbdc1c11aeb82be6eeb9b8ed98ce2a351be344b 100644 (file)
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -19,7 +19,9 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include "common.h"
 #include "cbfs.h"
 
@@ -27,6 +29,7 @@ typedef enum {
        CMD_ADD,
        CMD_ADD_PAYLOAD,
        CMD_ADD_STAGE,
+       CMD_REMOVE,
        CMD_CREATE,
        CMD_LOCATE,
        CMD_PRINT,
@@ -193,10 +196,36 @@ static int cbfs_add_stage(int argc, char **argv)
        return 0;
 }
 
-static int cbfs_create(int argc, char **argv)
+static int cbfs_remove(int argc, char **argv)
 {
        char *romname = argv[1];
        char *cmd = argv[2];
+       void *rom = loadrom(romname);
+
+       if (rom == NULL) {
+               printf("Could not load ROM image '%s'.\n", romname);
+               return 1;
+       }
+
+       if (argc < 4) {
+               printf("not enough arguments to '%s'.\n", cmd);
+               return 1;
+       }
+
+       char *cbfsname = argv[3];
+
+       if (remove_file_from_cbfs(cbfsname)) {
+               printf("Removing file '%s' failed.\n", cbfsname);
+               return 1;
+       }
+       if (writerom(romname, rom, romsize))
+               return 1;
+       return 0;
+}
+
+static int cbfs_create(int argc, char **argv)
+{
+       char *romname = argv[1];
        if (argc < 5) {
                printf("not enough arguments to 'create'.\n");
                return 1;
@@ -231,15 +260,15 @@ static int cbfs_locate(int argc, char **argv)
        uint32_t filesize = getfilesize(file);
        const char *filename = argv[4];
        int align = strtoul(argv[5], NULL, 0);
+       uint32_t location = cbfs_find_location(romname, filesize, filename, align);
 
-       printf("%x\n", cbfs_find_location(romname, filesize, filename, align));
-       return 0;
+       printf("%x\n", location);
+       return location == 0 ? 1 : 0;
 }
 
 static int cbfs_print(int argc, char **argv)
 {
        char *romname = argv[1];
-       char *cmd = argv[2];
        void *rom = loadrom(romname);
 
        if (rom == NULL) {
@@ -254,7 +283,6 @@ static int cbfs_print(int argc, char **argv)
 static int cbfs_extract(int argc, char **argv)
 {
        char *romname = argv[1];
-       char *cmd = argv[2];
        void *rom = loadrom(romname);
 
        if (rom == NULL) {
@@ -271,17 +299,18 @@ static int cbfs_extract(int argc, char **argv)
        return extract_file_from_cbfs(romname, argv[3], argv[4]);
 }
 
-struct command commands[] = {
+static const struct command commands[] = {
        {CMD_ADD, "add", cbfs_add},
        {CMD_ADD_PAYLOAD, "add-payload", cbfs_add_payload},
        {CMD_ADD_STAGE, "add-stage", cbfs_add_stage},
+       {CMD_REMOVE, "remove", cbfs_remove},
        {CMD_CREATE, "create", cbfs_create},
        {CMD_LOCATE, "locate", cbfs_locate},
        {CMD_PRINT, "print", cbfs_print},
        {CMD_EXTRACT, "extract", cbfs_extract},
 };
 
-void usage(void)
+static void usage(void)
 {
        printf
            ("cbfstool: Management utility for CBFS formatted ROM images\n\n"
@@ -292,6 +321,7 @@ void usage(void)
             " add FILE NAME TYPE [base address]    Add a component\n"
             " add-payload FILE NAME [COMP] [base]  Add a payload to the ROM\n"
             " add-stage FILE NAME [COMP] [base]    Add a stage to the ROM\n"
+            " remove FILE NAME                     Remove a component\n"
             " create SIZE BOOTBLOCK [ALIGN]        Create a ROM file\n"
             " locate FILE NAME ALIGN               Find a place for a file of that size\n"
             " print                                Show the contents of the ROM\n"
@@ -302,6 +332,20 @@ void usage(void)
        print_supported_filetypes();
 }
 
+/* Small, OS/libc independent runtime check
+ * for endianess
+ */
+int host_bigendian = 0;
+
+static void which_endian(void)
+{
+       char test[4] = "1234";
+       uint32_t inttest = *(uint32_t *) test;
+       if (inttest == 0x31323334) {
+               host_bigendian = 1;
+       }
+}
+
 int main(int argc, char **argv)
 {
        int i;
@@ -311,6 +355,8 @@ int main(int argc, char **argv)
                return 1;
        }
 
+       which_endian();
+
        char *cmd = argv[2];
 
        for (i = 0; i < ARRAY_SIZE(commands); i++) {