summaryrefslogtreecommitdiffstats
path: root/layout.c
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-04-28 15:22:14 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-04-28 15:22:14 +0000
commit941b865510329a796393275f040ed18d188dc143 (patch)
tree88f216baf356f0e22fb8c8f7733ca9f175bd1545 /layout.c
parenta54bcd883276c4564c594c122e2ff4adf64ce7e6 (diff)
downloadflashrom-941b865510329a796393275f040ed18d188dc143.zip
flashrom-941b865510329a796393275f040ed18d188dc143.tar.gz
One of the problems is that --force had multiple meanings
- Force chip read by faking probe success. - Force chip access even if the chip is bigger than max decode size for the flash bus. - Force erase even if erase is known bad. - Force write even if write is known bad. - Force writing even if cbtable tells us that this is the wrong image for this board. This patch cleans up --force usage: - Remove any suggestions to use --force for probe/read from flashrom output. - Don't talk about "success" or "Found chip" if the chip is forced. - Add a new internal programmer parameter boardmismatch=force. This overrides any mismatch detection from cbtable/image comparisons. - Add a new internal programmer parameter laptop=force_I_want_a_brick. - Adjust the documentation for --force. - Clean up the man page a bit whereever it talks about --force or laptops. Additional changes in this patch: - Add warnings about laptops to the documentation. - Abort if a laptop is detected. Can be overridden with the programmer parameter mentioned above. - Add "Portable" to the list of DMI strings indicating laptops. - Check if a chip specified with -c is known to flashrom. - Programmer parameter reliability and consistency fixes. - More paranoid self-checks. - Improve documentation. Corresponding to flashrom svn r996. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Diffstat (limited to 'layout.c')
-rw-r--r--layout.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/layout.c b/layout.c
index 26b7c6a..df77c2f 100644
--- a/layout.c
+++ b/layout.c
@@ -111,14 +111,15 @@ int show_id(uint8_t *bios, int size, int force)
!strcasecmp(mainboard_part, lb_part)) {
printf_debug("This firmware image matches this mainboard.\n");
} else {
- if (force) {
+ if (force_boardmismatch) {
printf("WARNING: This firmware image does not "
"seem to fit to this machine - forcing it.\n");
} else {
printf("ERROR: Your firmware image (%s:%s) does not "
"appear to\n be correct for the detected "
- "mainboard (%s:%s)\n\nOverride with --force if you "
- "are absolutely sure that you\nare using a correct "
+ "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,
OpenPOWER on IntegriCloud