summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2021-12-13 10:28:29 -0800
committerJulius Werner <jwerner@chromium.org>2021-12-14 21:45:32 +0000
commit0fd072d3f2a3360d73ec7b5b11a06b52025b17ea (patch)
treee9decf8fa0ab85fa5c8e9fe1646e484cf27d2d74
parent772714d3b32d005a0b6c03605283a2dc89e93e37 (diff)
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 <jwerner@chromium.org> Change-Id: Ib098278d68df65d348528fbfd2496b5737ca6246 Reviewed-on: https://review.coreboot.org/c/coreboot/+/60085 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Raul Rangel <rrangel@chromium.org>
-rw-r--r--util/cbfstool/cbfstool.c7
1 files changed, 1 insertions, 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"