From 8274c6321ae2ff29bc9eb0de9dc32d289d3c2cc5 Mon Sep 17 00:00:00 2001 From: Anastasia Klimchuk Date: Fri, 25 Nov 2022 18:10:43 +1100 Subject: cli, manpage: Clean up occurrences of old image argument --include argument was introduced and replaced --image argument in commit 45d50a101e8073191e6d88143990ed91d3bfe815 This patch cleans up remaining few places where old `--image` argument was mentioned so that now all the documentation has `--include`. --image is deprecated. Both old --image and new --include have the same short version -i and it remains the same. The code remains the same since the code handles --include already. Tested by running flashrom -h man ./flashrom.8.tmpl Ticket: https://ticket.coreboot.org/issues/372 Change-Id: If457e2b8548034868105b515125d7e8b4d5f6134 Signed-off-by: Anastasia Klimchuk Reviewed-on: https://review.coreboot.org/c/flashrom/+/70003 Reviewed-by: Edward O'Callaghan Reviewed-by: Felix Singer Tested-by: build bot (Jenkins) --- cli_classic.c | 6 ++++-- flashrom.8.tmpl | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cli_classic.c b/cli_classic.c index 5cc14a01..0b0944f3 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -71,8 +71,9 @@ static void cli_classic_usage(const char *name) " --fmap read ROM layout from fmap embedded in ROM\n" " --fmap-file read ROM layout from fmap in \n" " --ifd read layout from an Intel Firmware Descriptor\n" - " -i | --image [:] only read/write image from layout\n" + " -i | --include [:] only read/write image from layout\n" " (optionally with data from )\n" + " --image [:] deprecated, please use --include\n" " -o | --output log output to \n" " --flash-contents assume flash contents to be \n" " -L | --list-supported print supported devices\n" @@ -619,7 +620,8 @@ int main(int argc, char *argv[]) {"ifd", 0, NULL, OPTION_IFD}, {"fmap", 0, NULL, OPTION_FMAP}, {"fmap-file", 1, NULL, OPTION_FMAP_FILE}, - {"image", 1, NULL, 'i'}, + {"image", 1, NULL, 'i'}, // (deprecated): back compatibility. + {"include", 1, NULL, 'i'}, {"flash-contents", 1, NULL, OPTION_FLASH_CONTENTS}, {"flash-name", 0, NULL, OPTION_FLASH_NAME}, {"flash-size", 0, NULL, OPTION_FLASH_SIZE}, diff --git a/flashrom.8.tmpl b/flashrom.8.tmpl index e672869c..4c433233 100644 --- a/flashrom.8.tmpl +++ b/flashrom.8.tmpl @@ -49,7 +49,7 @@ flashrom \- detect, read, write, verify and erase flash chips (\fB\-\-flash\-name\fR|\fB\-\-flash\-size\fR| [\fB\-E\fR|\fB\-x\fR|\fB\-r\fR |\fB\-w\fR |\fB\-v\fR ] [(\fB\-l\fR |\fB\-\-ifd\fR|\fB \-\-fmap\fR|\fB\-\-fmap-file\fR ) - [\fB\-i\fR [:]]] + [\fB\-i\fR [:]]] [\fB\-\-wp\-status\fR] [\fB\-\-wp\-list\fR] [\fB\-\-wp\-enable\fR|\fB\-\-wp\-disable\fR] [\fB\-\-wp\-range\fR ,|\fB\-\-wp\-region\fR ] [\fB\-n\fR] [\fB\-N\fR] [\fB\-f\fR])] -- cgit v1.2.3