From 0fd072d3f2a3360d73ec7b5b11a06b52025b17ea Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Mon, 13 Dec 2021 10:28:29 -0800 Subject: [PATCH] cbfstool: Clean up remnants of locate action `cbfstool locate` and the associated -T switch were removed a looong time ago (2015 in CB:11671). However, getopt and the help text weren't cleaned up correctly. Fix that. Signed-off-by: Julius Werner Change-Id: Ib098278d68df65d348528fbfd2496b5737ca6246 Reviewed-on: https://review.coreboot.org/c/coreboot/+/60085 Tested-by: build bot (Jenkins) Reviewed-by: Raul Rangel --- util/cbfstool/cbfstool.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index a84601ec14..608cd32a3d 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -1771,7 +1771,6 @@ static struct option long_options[] = { {"pow2page", no_argument, 0, 'Q' }, {"ucode-region", required_argument, 0, 'q' }, {"size", required_argument, 0, 's' }, - {"top-aligned", required_argument, 0, 'T' }, {"type", required_argument, 0, 't' }, {"verbose", no_argument, 0, 'v' }, {"with-readonly", no_argument, 0, 'w' }, @@ -1927,9 +1926,6 @@ static void usage(char *name) "Create a legacy ROM file with CBFS master header*\n" " create -M flashmap [-r list,of,regions,containing,cbfses] " "Create a new-style partitioned firmware image\n" - " locate [-r image,regions] -f FILE -n NAME [-P page-size] \\\n" - " [-a align] [-T] " - "Find a place for a file of that size\n" " layout [-w] " "List mutable (or, with -w, readable) image regions\n" " print [-r image,regions] [-k] " @@ -1964,8 +1960,7 @@ static void usage(char *name) " specifying the location of this FMAP itself and a '%s'\n" " section describing the primary CBFS. It should also be noted\n" " that, when working with such images, the -F and -r switches\n" - " default to '%s' for convenience, and both the -b switch to\n" - " CBFS operations and the output of the locate action become\n" + " default to '%s' for convenience, and the -b switch becomes\n" " relative to the selected CBFS region's lowest address.\n" " The one exception to this rule is the top-aligned address,\n" " which is always relative to the end of the entire image\n"