summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-28 15:58:19 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-04-28 15:58:19 +0000
commit770185e2dc6a3e708711fbf2994a11c51829ed3f (patch)
treeb7c59e36c0a61ed8f02b8ee1899ba469dd22b4ef
parentf4161bd95531c2110625ec18ba901c414c921a3b (diff)
always unlock
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@745 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/package/openwrt/mtd.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/openwrt/package/openwrt/mtd.c b/openwrt/package/openwrt/mtd.c
index 6771b3c21..851f26628 100644
--- a/openwrt/package/openwrt/mtd.c
+++ b/openwrt/package/openwrt/mtd.c
@@ -237,7 +237,6 @@ void usage(void)
" erase erase all data on device\n"
" write <imagefile> write imagefile to device\n"
"Following options are available:\n"
- " -u unlock device before accessing it\n"
" -r reboot after successful command\n"
" -e <device> erase <device> before executing the command\n\n"
"Example: To write linux.trx to mtd4 labeled as linux and reboot afterwards\n"
@@ -257,13 +256,9 @@ int main (int argc, char **argv)
erase[0] = NULL;
boot = 0;
- unlock = 0;
- while ((ch = getopt(argc, argv, "ure:")) != -1)
+ while ((ch = getopt(argc, argv, "re:")) != -1)
switch (ch) {
- case 'u':
- unlock = 1;
- break;
case 'r':
boot = 1;
break;
@@ -308,12 +303,10 @@ int main (int argc, char **argv)
i++;
}
- if (unlock)
- mtd_unlock(device);
+ mtd_unlock(device);
switch (cmd) {
case CMD_UNLOCK:
- mtd_unlock(device);
break;
case CMD_ERASE:
mtd_erase(device);