summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Norris <computersforpeace@gmail.com>2011-06-27 11:27:25 -0700
committerArtem Bityutskiy <dedekind1@gmail.com>2011-06-29 08:42:41 +0300
commit443188385cc3aa9d059012df6380ce6bbfed1393 (patch)
tree9ada8583f11935d1c74c8d6ddfdcf02f07465356
parent4d1793e25fd6691f8a2407d6d2dfb23809086ef0 (diff)
mtd-utils: kill flash_info
According to "feature-removal-schedule," we kill flash_info in favor of mtdinfo. Signed-off-by: Brian Norris <computersforpeace@gmail.com> Acked-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Artem Bityutskiy <dedekind1@gmail.com>
-rw-r--r--Makefile2
-rw-r--r--feature-removal-schedule.txt6
-rw-r--r--flash_info.c67
3 files changed, 1 insertions, 74 deletions
diff --git a/Makefile b/Makefile
index 8f871c6..afbe201 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ TESTS = tests
MTD_BINS = \
ftl_format flash_erase nanddump doc_loadbios \
- ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info \
+ ftl_check mkfs.jffs2 flash_lock flash_unlock \
flash_otp_info flash_otp_dump mtd_debug flashcp nandwrite nandtest \
jffs2dump \
nftldump nftl_format docfdisk \
diff --git a/feature-removal-schedule.txt b/feature-removal-schedule.txt
index a5980f7..0920203 100644
--- a/feature-removal-schedule.txt
+++ b/feature-removal-schedule.txt
@@ -34,9 +34,3 @@ the -m option. For now, we just have a warning, but the option will be
removed in release 1.4.6.
---------------------------
-3. flash_info utility
-
-This is duplicating behavior with the mtdinfo utility. Now the util
-warns when people use it, but it'll be removed in release 1.4.6.
-
----------------------------
diff --git a/flash_info.c b/flash_info.c
deleted file mode 100644
index d9a4492..0000000
--- a/flash_info.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * flash_info.c -- print info about a MTD device
- */
-
-#define PROGRAM_NAME "flash_info"
-
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <time.h>
-#include <sys/ioctl.h>
-#include <sys/mount.h>
-
-#include "common.h"
-#include <mtd/mtd-user.h>
-
-static void usage(int status)
-{
- fprintf(status ? stderr : stdout,
- "Usage: %s <device> [devices]\n",
- PROGRAM_NAME);
- exit(status);
-}
-
-int main(int argc, char *argv[])
-{
- int fd, i, regcount;
-
- warnmsg("this utility is deprecated in favor of `mtdinfo` and will be removed in mtd-utils-1.4.6");
-
- if (argc < 2)
- usage(1);
- if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))
- usage(0);
-
- for (i = 1; i < argc; ++i) {
- const char *dev = argv[i];
- int r;
- region_info_t reginfo;
-
- /* Open and size the device */
- fd = open(dev, O_RDONLY);
- if (fd < 0) {
- sys_errmsg("could not open: %s", dev);
- continue;
- }
-
- if (ioctl(fd, MEMGETREGIONCOUNT, &regcount))
- continue;
-
- printf("%s: %d erase regions\n", dev, regcount);
- for (r = 0; r < regcount; ++r) {
- reginfo.regionindex = r;
- if (ioctl(fd, MEMGETREGIONINFO, &reginfo) == 0) {
- printf("Region %d is at 0x%x with size 0x%x and "
- "has 0x%x blocks\n", r, reginfo.offset,
- reginfo.erasesize, reginfo.numblocks);
- } else {
- warnmsg("can not read region %d from a %d region device",
- r, regcount);
- }
- }
- }
-
- return 0;
-}