X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=util%2Fcbfstool%2Fcbfstool.c;h=4c28c2984490f07688c3d7321be049b81d2da8c3;hb=ce37765772ebe0e58d3da81a35131d23e9f05137;hp=183a6144913944c67c3387784c99593e8455a8a7;hpb=336daa76faa6255cf487100a9741c740802bb32f;p=coreboot.git

diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 183a61449..4c28c2984 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -19,7 +19,6 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
 #include <string.h>
 #include "common.h"
 #include "cbfs.h"
@@ -30,7 +29,8 @@ typedef enum {
 	CMD_ADD_STAGE,
 	CMD_CREATE,
 	CMD_LOCATE,
-	CMD_PRINT
+	CMD_PRINT,
+	CMD_EXTRACT,
 } cmd_t;
 
 struct command {
@@ -83,7 +83,8 @@ static int cbfs_add(int argc, char **argv)
 	cbfsfile = create_cbfs_file(cbfsname, filedata, &filesize, type, &base);
 	if (add_file_to_cbfs(cbfsfile, filesize, base))
 		return 1;
-	writerom(romname, rom, romsize);
+	if (writerom(romname, rom, romsize))
+		return 1;
 	return 0;
 }
 
@@ -131,7 +132,8 @@ static int cbfs_add_payload(int argc, char **argv)
 			     CBFS_COMPONENT_PAYLOAD, &base);
 	if (add_file_to_cbfs(cbfsfile, filesize, base))
 		return 1;
-	writerom(romname, rom, romsize);
+	if (writerom(romname, rom, romsize))
+		return 1;
 	return 0;
 }
 
@@ -180,7 +182,8 @@ static int cbfs_add_stage(int argc, char **argv)
 
 	if (add_file_to_cbfs(cbfsfile, filesize, base))
 		return 1;
-	writerom(romname, rom, romsize);
+	if (writerom(romname, rom, romsize))
+		return 1;
 	return 0;
 }
 
@@ -242,29 +245,55 @@ static int cbfs_print(int argc, char **argv)
 	return 0;
 }
 
+static int cbfs_extract(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 != 5)
+	{
+		printf("Error: you must specify a CBFS name and a file to dump it in.\n");
+		return 1;
+	}
+
+	return extract_file_from_cbfs(romname, argv[3], argv[4]);
+}
+
 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_CREATE, "create", cbfs_create},
 	{CMD_LOCATE, "locate", cbfs_locate},
-	{CMD_PRINT, "print", cbfs_print}
+	{CMD_PRINT, "print", cbfs_print},
+	{CMD_EXTRACT, "extract", cbfs_extract},
 };
 
 void usage(void)
 {
 	printf
-	    ("cbfstool: Management utility for CBFS formatted ROM images\n"
-	     "USAGE:\n" "cbfstool [-h]\n"
-	     "cbfstool FILE COMMAND [PARAMETERS]...\n\n" "OPTIONs:\n"
-	     " -h		Display this help message\n\n"
+	    ("cbfstool: Management utility for CBFS formatted ROM images\n\n"
+	     "USAGE:\n" " cbfstool [-h]\n"
+	     " cbfstool FILE COMMAND [PARAMETERS]...\n\n" "OPTIONs:\n"
+	     "  -h		Display this help message\n\n"
 	     "COMMANDs:\n"
-	     "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"
-	     "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");
+	     " 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"
+	     " 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"
+	     " extract NAME FILE                    Extracts a raw payload from ROM\n"
+	     "\n"
+	     "TYPEs:\n"
+	     );
+	print_supported_filetypes();
 }
 
 int main(int argc, char **argv)