summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2009-04-23 14:57:55 +0000
committerUwe Hermann <uwe@hermann-uwe.de>2009-04-23 14:57:55 +0000
commita44228c435d129740ced86fe66e9641af165b11f (patch)
treea7658da03dac1e6eabb63344b5b4aaa8986ca6ad
parent72deb69ce16f07b4a79e59d1f386744a9adcc4d2 (diff)
Don't duplicate option description in README, the manpage already has
that info. Also, additional small cosmetic fix. Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de> Acked-by: Uwe Hermann <uwe@hermann-uwe.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4196 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--util/flashrom/README28
-rw-r--r--util/flashrom/layout.c3
2 files changed, 5 insertions, 26 deletions
diff --git a/util/flashrom/README b/util/flashrom/README
index b13d1a734f..a272080479 100644
--- a/util/flashrom/README
+++ b/util/flashrom/README
@@ -22,30 +22,10 @@ To build the flashrom utility you need to install the following packages:
* zlib-devel / zlib1g-dev
-Usage
------
-
- $ flashrom [-rwvEVfLhR] [-c chipname] [-s exclude_start] [-e exclude_end]
- [-m [vendor:]part] [-l file.layout] [-i imagename] [file]
- -r | --read: read flash and save into file
- -w | --write: write file into flash (default when
- file is specified)
- -v | --verify: verify flash against file
- -E | --erase: erase flash device
- -V | --verbose: more verbose output
- -c | --chip <chipname>: probe only for specified flash chip
- -s | --estart <addr>: exclude start position
- -e | --eend <addr>: exclude end postion
- -m | --mainboard <[vendor:]part>: override mainboard settings
- -f | --force: force write without checking image
- -l | --layout <file.layout>: read rom layout from file
- -i | --image <name>: only flash image name from flash layout
- -L | --list-supported: print supported devices
- -h | --help: print this help text
- -R | --version: print the version (release)
-
- If no file is specified, then all that happens
- is that flash info is dumped and the flash chip is set to writable.
+Usage / Options
+---------------
+
+Please see the flashrom(8) manpage.
Exit status
diff --git a/util/flashrom/layout.c b/util/flashrom/layout.c
index 84a8ec7052..87a52ad26f 100644
--- a/util/flashrom/layout.c
+++ b/util/flashrom/layout.c
@@ -108,8 +108,7 @@ int show_id(uint8_t *bios, int size, int force)
*/
if (!strcasecmp(mainboard_vendor, lb_vendor) &&
!strcasecmp(mainboard_part, lb_part)) {
- printf_debug("This firmware image matches "
- "this motherboard.\n");
+ printf_debug("This firmware image matches this mainboard.\n");
} else {
if (force) {
printf("WARNING: This firmware image does not "