diff options
author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2012-01-04 00:48:27 +0000 |
---|---|---|
committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2012-01-04 00:48:27 +0000 |
commit | 2d927fbd7bbfd6d03280757d447991a60c690c6e (patch) | |
tree | 7f14a4305d587d4ff56c1b3f764a9016dba5d03b /layout.c | |
parent | 9bcf2684d7781de71551ab14d3c3be46890ca432 (diff) | |
download | flashrom-2d927fbd7bbfd6d03280757d447991a60c690c6e.tar.gz flashrom-2d927fbd7bbfd6d03280757d447991a60c690c6e.tar.bz2 flashrom-2d927fbd7bbfd6d03280757d447991a60c690c6e.zip |
Replace --mainboard with -p internal:mainboard
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.
Corresponding to flashrom svn r1483.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'layout.c')
-rw-r--r-- | layout.c | 25 |
1 files changed, 14 insertions, 11 deletions
@@ -106,11 +106,11 @@ int show_id(uint8_t *bios, int size, int force) /* * If lb_vendor is not set, the coreboot table was - * not found. Nor was -m VENDOR:PART specified. + * not found. Nor was -p internal:mainboard=VENDOR:PART specified. */ if (!lb_vendor || !lb_part) { - msg_pinfo("Note: If the following flash access fails, " - "try -m <vendor>:<mainboard>.\n"); + msg_pinfo("Note: If the following flash access fails, try " + "-p internal:mainboard=<vendor>:<mainboard>.\n"); return 0; } @@ -126,14 +126,17 @@ int show_id(uint8_t *bios, int size, int force) "seem to fit to this machine - forcing it.\n"); } else { msg_pinfo("ERROR: Your firmware image (%s:%s) does not " - "appear to\n be correct for the detected " - "mainboard (%s:%s)\n\nOverride with -p internal:" - "boardmismatch=force if you are absolutely sure " - "that\nyou are using a correct " - "image for this mainboard or override\nthe detected " - "values with --mainboard <vendor>:<mainboard>.\n\n", - mainboard_vendor, mainboard_part, lb_vendor, - lb_part); + "appear to\n" + " be correct for the detected " + "mainboard (%s:%s)\n\n" + "Override with -p internal:boardmismatch=" + "force to ignore the board name in the\n" + "firmware image or override the detected " + "mainboard with\n" + "-p internal:mainboard=<vendor>:<mainboard>." + "\n\n", + mainboard_vendor, mainboard_part, lb_vendor, + lb_part); exit(1); } } |