summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2007-05-23 18:24:58 +0000
committerStefan Reinauer <stefan.reinauer@coreboot.org>2007-05-23 18:24:58 +0000
commit7c1402f2208f3240de9f28f6ac48a24f526c430d (patch)
treedff2c9bdbc5f3555b7824f5c690c9571c7cf82a8
parentce532975cbe35d88f767c6305d272c8b6f16ccf7 (diff)
downloadast2050-flashrom-7c1402f2208f3240de9f28f6ac48a24f526c430d.zip
ast2050-flashrom-7c1402f2208f3240de9f28f6ac48a24f526c430d.tar.gz
Unify mmap error messages
Corresponding to flashrom svn r112 and coreboot v2 svn r2690. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de>
-rw-r--r--82802ab.c2
-rw-r--r--flashrom.c7
-rw-r--r--lbtable.c4
-rw-r--r--sharplhf00l04.c2
-rw-r--r--sst49lfxxxc.c2
-rw-r--r--sst_fwhub.c2
6 files changed, 9 insertions, 10 deletions
diff --git a/82802ab.c b/82802ab.c
index 9512c67..199cf4d 100644
--- a/82802ab.c
+++ b/82802ab.c
@@ -83,7 +83,7 @@ int probe_82802ab(struct flashchip *flash)
fd_mem, (off_t) (0 - 0x400000 - size));
if (registers == MAP_FAILED) {
// it's this part but we can't map it ...
- perror("Error MMAP memory using " MEM_DEV);
+ perror("Can't mmap memory using " MEM_DEV);
exit(1);
}
diff --git a/flashrom.c b/flashrom.c
index cd97dda..a05def7 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -116,15 +116,16 @@ struct flashchip *probe_flash(struct flashchip *flash)
#ifdef TS5300
// FIXME: Wrong place for this decision
+ // FIXME: This should be autodetected. It is trivial.
flash_baseaddr = 0x9400000;
#else
flash_baseaddr = (0xffffffff - size + 1);
#endif
/* If getpagesize() > size ->
- * `Error MMAP /dev/mem: Invalid argument'
+ * "Can't mmap memory using /dev/mem: Invalid argument"
* This should never happen as we don't support any flash chips
- * smaller than 4k or 8k yet.
+ * smaller than 4k or 8k (yet).
*/
if (getpagesize() > size) {
@@ -136,7 +137,7 @@ struct flashchip *probe_flash(struct flashchip *flash)
bios = mmap(0, size, PROT_WRITE | PROT_READ, MAP_SHARED,
fd_mem, (off_t) flash_baseaddr);
if (bios == MAP_FAILED) {
- perror("Error: Can't mmap " MEM_DEV ".");
+ perror("Can't mmap memory using " MEM_DEV);
exit(1);
}
flash->virtual_memory = bios;
diff --git a/lbtable.c b/lbtable.c
index d65d1a0..bbee991 100644
--- a/lbtable.c
+++ b/lbtable.c
@@ -161,9 +161,7 @@ int linuxbios_init(void)
low_1MB = mmap(0, 1024 * 1024, PROT_READ, MAP_SHARED, fd_mem,
0x00000000);
if (low_1MB == MAP_FAILED) {
- fprintf(stderr,
- "Can not mmap " MEM_DEV " at %08lx errno(%d):%s\n",
- 0x00000000UL, errno, strerror(errno));
+ perror("Can't mmap memory using " MEM_DEV);
exit(-2);
}
lb_table = 0;
diff --git a/sharplhf00l04.c b/sharplhf00l04.c
index fd3a714..a4d086e 100644
--- a/sharplhf00l04.c
+++ b/sharplhf00l04.c
@@ -82,7 +82,7 @@ int probe_lhf00l04(struct flashchip *flash)
fd_mem, (off_t) (0 - 0x400000 - size));
if (registers == MAP_FAILED) {
// it's this part but we can't map it ...
- perror("Error MMAP /dev/mem");
+ perror("Can't mmap memory using " MEM_DEV);
exit(1);
}
diff --git a/sst49lfxxxc.c b/sst49lfxxxc.c
index efa2a61..b8f4b84 100644
--- a/sst49lfxxxc.c
+++ b/sst49lfxxxc.c
@@ -154,7 +154,7 @@ int probe_49lfxxxc(struct flashchip *flash)
fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1));
if (registers == MAP_FAILED) {
// it's this part but we can't map it ...
- perror("Error MMAP /dev/mem");
+ perror("Can't mmap memory using " MEM_DEV);
exit(1);
}
flash->virtual_registers = registers;
diff --git a/sst_fwhub.c b/sst_fwhub.c
index 72a8453..78589b1 100644
--- a/sst_fwhub.c
+++ b/sst_fwhub.c
@@ -56,7 +56,7 @@ int probe_sst_fwhub(struct flashchip *flash)
fd_mem, (off_t) (0xFFFFFFFF - 0x400000 - size + 1));
if (registers == MAP_FAILED) {
// it's this part but we can't map it ...
- perror("Error MMAP /dev/mem");
+ perror("Can't mmap memory using " MEM_DEV);
exit(1);
}
OpenPOWER on IntegriCloud