summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-03-18 13:38:02 +0200
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-03-18 13:38:02 +0200
commit6022deaa5b3b46926757d90fedb8835718150763 (patch)
treeb07f22d183d943fe0a5859d0721a6bb08472ff12
parent5efcdf7a2bfafd01e5c6d53dd46335f30704b2ad (diff)
nanddump: fail if -s parameter is unaligned
Implement the feature which we planned long time ago - make nanddump fail if the -s parameter is not NAND page-aligned. Also bump nanddump version. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--feature-removal-schedule.txt12
-rw-r--r--nanddump.c9
2 files changed, 5 insertions, 16 deletions
diff --git a/feature-removal-schedule.txt b/feature-removal-schedule.txt
index 2899e34..30f0403 100644
--- a/feature-removal-schedule.txt
+++ b/feature-removal-schedule.txt
@@ -26,15 +26,5 @@ to stop using them.
The further step is to remove both of them.
---------------------------
-2. nanddump: fail when the -s parameter is not page aligned
-
-nanddump should be consistent with nandwrite, and refuse accepting non page
-aligned start addresses. These dumps are most likely useless, since nandwrite
-won't write then at this location. Currently only a warning is issued to keep
-backward compatibility during a transition period. This should become an error
-one release after the next release (current is mtd-utils-1.4.0, 18 Sep 2010).
-
-To be done by Artem Bityutskiy.
----------------------------
-3.
+2.
---------------------------
diff --git a/nanddump.c b/nanddump.c
index 1dbb247..214fb12 100644
--- a/nanddump.c
+++ b/nanddump.c
@@ -14,7 +14,7 @@
*/
#define PROGRAM_NAME "nanddump"
-#define VERSION "$Revision: 1.29 $"
+#define VERSION "1.30"
#define _GNU_SOURCE
#include <ctype.h>
@@ -366,11 +366,10 @@ int main(int argc, char * const argv[])
/* Initialize start/end addresses and block size */
if (start_addr & (mtd.min_io_size - 1)) {
- fprintf(stderr, "WARNING: The start address is not page-aligned !\n"
- "The pagesize of this NAND Flash is 0x%x.\n"
- "nandwrite doesn't allow writes starting at this location.\n"
- "Future versions of nanddump will fail here.\n",
+ fprintf(stderr, "the start address (-s parameter) is not page-aligned!\n"
+ "The pagesize of this NAND Flash is 0x%x.\n",
mtd.min_io_size);
+ goto closeall;
}
if (length)
end_addr = start_addr + length;