Add a "locate" function cbfstool, which helps you find

out a suitable address to put a XIP stage to.

Specifically, you pass it the file (to get its filesize), its filename
(as the header has a variable length that depends on it), and the
granularity requirement it has to fit in (for XIP).
The granularity is MTRR-style: when you request 0x10000, cbfstool looks
for a suitable place in a 64kb-aligned 64kb block.

cbfstool simply prints out a hex value which is the start address of a
suitably located free memory block. That value can then be used with
cbfs add-stage to store the file in the ROM image.

It's a two-step operation (instead of being merged into cbfs add-stage)
because the image must be linked twice: First, with some bogus, but safe
base address (eg. 0) to figure out the target address (based on file
size). Then a second time at the target address.

The work flow is:
 - link file
 - cbfstool locate
 - link file again
 - cbfstool add-stage.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4929 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

util/cbfstool/cbfstool.c

@@ -28,6 +28,7 @@ typedef enum {
 	CMD_ADD_PAYLOAD,
 	CMD_ADD_STAGE,
 	CMD_CREATE,
+	CMD_LOCATE,
 	CMD_PRINT
 } cmd_t;
 
@@ -78,8 +79,7 @@ static int cbfs_add(int argc, char **argv)
 	if (argc > 6) {
 		base = strtoul(argv[6], NULL, 0);
 	}
-	cbfsfile =
-	    create_cbfs_file(cbfsname, filedata, &filesize, type, &base);
+	cbfsfile = create_cbfs_file(cbfsname, filedata, &filesize, type, &base);
 	if (add_file_to_cbfs(cbfsfile, filesize, base))
 		return 1;
 	writerom(romname, rom, romsize);
@@ -203,6 +203,23 @@ static int cbfs_create(int argc, char **argv)
 	return create_cbfs_image(romname, size, bootblock, align);
 }
 
+static int cbfs_locate(int argc, char **argv)
+{
+	char *romname = argv[1];
+	if (argc < 6) {
+		printf("not enough arguments to 'locate'.\n");
+		return 1;
+	}
+
+	const char *file = argv[3];
+	uint32_t filesize = getfilesize(file);
+	const char *filename = argv[4];
+	int align = strtoul(argv[5], NULL, 0);
+
+	printf("%x\n", cbfs_find_location(romname, filesize, filename, align));
+	return 0;
+}
+
 static int cbfs_print(int argc, char **argv)
 {
 	char *romname = argv[1];
@@ -223,6 +240,7 @@ struct command commands[] = {
 	{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}
 };
 
@@ -238,6 +256,7 @@ void usage(void)
 	     "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 BSIZE 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");
 }