openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 22:21:16 +02:00
Code Issues Releases Wiki Activity

Replace --mainboard with -p internal:mainboard

Browse Source 
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>
This commit is contained in:
Carl-Daniel Hailfinger
2012-01-04 00:48:27 +00:00
parent 9bcf2684d7
commit 2d927fbd7b
9 changed files with 62 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
layout.c
View File

@ -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);
}
}