cbfstool: improve error messages

If a file can't be added by cbfstool, print the type and name of the file
in the error message.

Change-Id: I369d6f5be09ec53ee5beea2cfea65a80407f0ba3
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/271
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marcj303@gmail.com>

diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 4c28c2984490f07688c3d7321be049b81d2da8c3..f017b2e2e07f3d58e2c1d938b0e4ba09edd0693b 100644 (file)
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -81,8 +81,10 @@ static int cbfs_add(int argc, char **argv)
                base = strtoul(argv[6], NULL, 0);
        }
        cbfsfile = create_cbfs_file(cbfsname, filedata, &filesize, type, &base);
-       if (add_file_to_cbfs(cbfsfile, filesize, base))
+       if (add_file_to_cbfs(cbfsfile, filesize, base)) {
+               printf("Adding file '%s' failed.\n", filename);
                return 1;
+       }
        if (writerom(romname, rom, romsize))
                return 1;
        return 0;
@@ -130,8 +132,10 @@ static int cbfs_add_payload(int argc, char **argv)
        cbfsfile =
            create_cbfs_file(cbfsname, payload, &filesize,
                             CBFS_COMPONENT_PAYLOAD, &base);
-       if (add_file_to_cbfs(cbfsfile, filesize, base))
+       if (add_file_to_cbfs(cbfsfile, filesize, base)) {
+               printf("Adding payload '%s' failed.\n", filename);
                return 1;
+       }
        if (writerom(romname, rom, romsize))
                return 1;
        return 0;
@@ -180,8 +184,10 @@ static int cbfs_add_stage(int argc, char **argv)
            create_cbfs_file(cbfsname, stage, &filesize,
                             CBFS_COMPONENT_STAGE, &base);
 
-       if (add_file_to_cbfs(cbfsfile, filesize, base))
+       if (add_file_to_cbfs(cbfsfile, filesize, base)) {
+               printf("Adding stage '%s' failed.\n", filename);
                return 1;
+       }
        if (writerom(romname, rom, romsize))
                return 1;
        return 0;