From 6056b97fce79d3534363dcf508ab7b4a18a459d6 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Wed, 11 Nov 2009 21:32:23 +0000 Subject: Rework bootblock size handling: - don't pretend to create a bootblock as large as the ROM in Kconfig (it's 64k at most) - don't pretend to accept a bootblocksize value in cbfstool create (it ignored it) - patch up the build systems to keep it working Signed-off-by: Patrick Georgi Acked-by: Myles Watson Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4934 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/cbfstool/cbfstool.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'util/cbfstool') diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index d8f2ac1bb3..26e443364f 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -187,18 +187,17 @@ static int cbfs_create(int argc, char **argv) { char *romname = argv[1]; char *cmd = argv[2]; - if (argc < 6) { + if (argc < 5) { printf("not enough arguments to 'create'.\n"); return 1; } uint32_t size = strtoul(argv[3], NULL, 0); - /* ignore bootblock size. we use whatever we get and won't allocate any larger */ - char *bootblock = argv[5]; + char *bootblock = argv[4]; uint32_t align = 0; - if (argc > 6) - align = strtoul(argv[6], NULL, 0); + if (argc > 5) + align = strtoul(argv[5], NULL, 0); return create_cbfs_image(romname, size, bootblock, align); } @@ -255,7 +254,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" - "create SIZE BSIZE BOOTBLOCK [ALIGN] Create a ROM file\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"); } -- cgit v1.2.3