From 234fb84eb42ed6718a23b99e822ea3d726e8b995 Mon Sep 17 00:00:00 2001 From: hailfinger Date: Wed, 4 Jan 2012 00:48:27 +0000 Subject: Replace --mainboard with -p internal:mainboard --mainboard is a relic from a time before external programmers and makes the CLI inconsistent. Use a programmer parameter instead and free up the short option -m. NOTE: The --list-supported-wiki output changed to use -p internal:mainboard= instead of -m The --list-supported output changed the heading of the mainboard list from Vendor Board Status Required option to Vendor Board Status Required value for -p internal:mainboard= Fix lb_vendor_dev_from_string() not to write to the supplied string. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Stefan Tauner git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1483 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- board_enable.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'board_enable.c') diff --git a/board_enable.c b/board_enable.c index bdd5db3..2229f8b 100644 --- a/board_enable.c +++ b/board_enable.c @@ -2070,7 +2070,8 @@ static int it8718f_gpio63_raise(void) * The coreboot ids are used two fold. When running with a coreboot firmware, * the ids uniquely matches the coreboot board identification string. When a * legacy bios is installed and when autodetection is not possible, these ids - * can be used to identify the board through the -m command line argument. + * can be used to identify the board through the -p internal:mainboard= + * programmer parameter. * * When a board is identified through its coreboot ids (in both cases), the * main pci ids are still required to match, as a safeguard. @@ -2245,7 +2246,8 @@ static const struct board_match *board_match_cbname(const char *vendor, msg_pinfo("AMBIGUOUS BOARD NAME: %s\n", part); msg_pinfo("At least vendors '%s' and '%s' match.\n", partmatch->lb_vendor, board->lb_vendor); - msg_perr("Please use the full -m vendor:part syntax.\n"); + msg_perr("Please use the full -p internal:mainboard=" + "vendor:part syntax.\n"); return NULL; } partmatch = board; @@ -2259,7 +2261,8 @@ static const struct board_match *board_match_cbname(const char *vendor, * coreboot table. If it was, the coreboot implementor is * expected to fix flashrom, too. */ - msg_perr("\nUnknown vendor:board from -m option: %s:%s\n\n", + msg_perr("\nUnknown vendor:board from -p internal:mainboard=" + " programmer parameter:\n%s:%s\n\n", vendor, part); } return NULL; -- cgit v1.2.1