Merge branch 'busybox' into merge

2 files changed, 12 insertions, 11 deletions

diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index 0598371d5..bf9b739a1 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -11,10 +11,11 @@
  */
 
 //usage:#define flash_eraseall_trivial_usage
-//usage:       "[-jq] MTD_DEVICE"
+//usage:       "[-jNq] MTD_DEVICE"
 //usage:#define flash_eraseall_full_usage "\n\n"
 //usage:       "Erase an MTD device\n"
 //usage:     "\n        -j      Format the device for jffs2"
+//usage:     "\n        -N      Don't skip bad blocks"
 //usage:     "\n        -q      Don't display progress messages"
 
 #include "libbb.h"
@@ -22,9 +23,9 @@
 #include <linux/jffs2.h>
 
 #define OPTION_J  (1 << 0)
-#define OPTION_Q  (1 << 1)
-#define IS_NAND   (1 << 2)
-#define BBTEST    (1 << 3)
+#define OPTION_N  (1 << 1)
+#define OPTION_Q  (1 << 2)
+#define IS_NAND   (1 << 3)
 
 /* mtd/jffs2-user.h used to have this atrocity:
 extern int target_endian;
@@ -71,7 +72,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
         char *mtd_name;
 
         opt_complementary = "=1";
-        flags = BBTEST | getopt32(argv, "jq");
+        flags = getopt32(argv, "jNq");
 
         mtd_name = argv[optind];
         fd = xopen(mtd_name, O_RDWR);
@@ -139,7 +140,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
 
         for (erase.start = 0; erase.start < meminfo.size;
              erase.start += meminfo.erasesize) {
-                if (flags & BBTEST) {
+                if (!(flags & OPTION_N)) {
                         int ret;
                         loff_t offset = erase.start;
 
@@ -154,7 +155,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
                                  * types e.g. NOR
                                  */
                                 if (errno == EOPNOTSUPP) {
-                                        flags &= ~BBTEST;
+                                        flags |= OPTION_N;
                                         if (flags & IS_NAND)
                                                 bb_error_msg_and_die("bad block check not available");
                                 } else {
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index 5908ac773..e3f9b565d 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -23,7 +23,7 @@
 //config:         Dump the content of raw NAND chip
 
 //applet:IF_NANDWRITE(APPLET(nandwrite, BB_DIR_USR_SBIN, BB_SUID_DROP))
-//applet:IF_NANDWRITE(APPLET_ODDNAME(nanddump, nandwrite, BB_DIR_USR_SBIN, BB_SUID_DROP, nanddump))
+//applet:IF_NANDDUMP(APPLET_ODDNAME(nanddump, nandwrite, BB_DIR_USR_SBIN, BB_SUID_DROP, nanddump))
 
 //kbuild:lib-$(CONFIG_NANDWRITE) += nandwrite.o
 //kbuild:lib-$(CONFIG_NANDDUMP) += nandwrite.o
@@ -31,14 +31,14 @@
 //usage:#define nandwrite_trivial_usage
 //usage:        "[-p] [-s ADDR] MTD_DEVICE [FILE]"
 //usage:#define nandwrite_full_usage "\n\n"
-//usage:        "Write to the specified MTD device\n"
+//usage:        "Write to MTD_DEVICE\n"
 //usage:     "\n        -p      Pad to page size"
 //usage:     "\n        -s ADDR Start address"
 
 //usage:#define nanddump_trivial_usage
-//usage:        "[-o] [-b] [-s ADDR] [-f FILE] MTD_DEVICE"
+//usage:        "[-o] [-b] [-s ADDR] [-l LEN] [-f FILE] MTD_DEVICE"
 //usage:#define nanddump_full_usage "\n\n"
-//usage:        "Dump the specified MTD device\n"
+//usage:        "Dump MTD_DEVICE\n"
 //usage:     "\n        -o      Dump oob data"
 //usage:     "\n        -b      Omit bad block from the dump"
 //usage:     "\n        -s ADDR Start address"