emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flash_eraseall: implement -N

Browse Source 
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Alexander Shiyan 2013-03-15 00:42:39 +01:00 committed by Denys Vlasenko
parent 0d61dcd641
commit 45dc96c8a6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
miscutils/flash_eraseall.c
View File

@ -11,10 +11,11 @@
*/ */
//usage:#define flash_eraseall_trivial_usage //usage:#define flash_eraseall_trivial_usage
//usage: "[-jq] MTD_DEVICE" //usage: "[-jNq] MTD_DEVICE"
//usage:#define flash_eraseall_full_usage "\n\n" //usage:#define flash_eraseall_full_usage "\n\n"
//usage: "Erase an MTD device\n" //usage: "Erase an MTD device\n"
//usage: "\n -j Format the device for jffs2" //usage: "\n -j Format the device for jffs2"
//usage: "\n -N Don't skip bad blocks"
//usage: "\n -q Don't display progress messages" //usage: "\n -q Don't display progress messages"
#include "libbb.h" #include "libbb.h"
@ -22,9 +23,9 @@
#include <linux/jffs2.h> #include <linux/jffs2.h>
#define OPTION_J (1 << 0) #define OPTION_J (1 << 0)
#define OPTION_Q (1 << 1) #define OPTION_N (1 << 1)
#define IS_NAND (1 << 2) #define OPTION_Q (1 << 2)
#define BBTEST (1 << 3) #define IS_NAND (1 << 3)
/* mtd/jffs2-user.h used to have this atrocity: /* mtd/jffs2-user.h used to have this atrocity:
extern int target_endian; extern int target_endian;
@ -71,7 +72,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
char *mtd_name; char *mtd_name;
opt_complementary = "=1"; opt_complementary = "=1";
flags = BBTEST | getopt32(argv, "jq"); flags = getopt32(argv, "jNq");
mtd_name = argv[optind]; mtd_name = argv[optind];
fd = xopen(mtd_name, O_RDWR); 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; for (erase.start = 0; erase.start < meminfo.size;
erase.start += meminfo.erasesize) { erase.start += meminfo.erasesize) {
if (flags & BBTEST) { if (!(flags & OPTION_N)) {
int ret; int ret;
loff_t offset = erase.start; loff_t offset = erase.start;
@ -154,7 +155,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
* types e.g. NOR * types e.g. NOR
*/ */
if (errno == EOPNOTSUPP) { if (errno == EOPNOTSUPP) {
flags &= ~BBTEST; flags |= OPTION_N;
if (flags & IS_NAND) if (flags & IS_NAND)
bb_error_msg_and_die("bad block check not available"); bb_error_msg_and_die("bad block check not available");
} else { } else {