flash_unlock: enhancing for unlocking of specified number of blocks

This patch enhances the flash_unlock utility to be able to do
unlocking for specified blocks range.
This patch also fixes calculation of 'length' as in previous patch.

Say there are 240 blocks present in the device. Then:
offset starts from: 0x0
and full size of device: 0x1E00000

doing: 240 * 0x20000 gives -> 0x1E00000
But last block address should be 0x1DE0000 (which spans for 0x20000
bytes, adding up to size of 0x1E00000)

Signed-off-by: Vimal Singh <vimalsingh@ti.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/flash_unlock.c b/flash_unlock.c
index 648dc4f42d994915e0b881bccfa5f5decb80d9ad..3969453bf5637946faf088e41f8b5e09e2948767 100644 (file)
--- a/flash_unlock.c
+++ b/flash_unlock.c
@@ -21,13 +21,14 @@ int main(int argc, char *argv[])
        int fd;
        struct mtd_info_user mtdInfo;
        struct erase_info_user mtdLockInfo;
+       int count;
 
        /*
         * Parse command line options
         */
-       if(argc != 2)
+       if(argc < 2)
        {
-               fprintf(stderr, "USAGE: %s <mtd device>\n", argv[0]);
+               fprintf(stderr, "USAGE: %s <mtd device> <offset in hex> <block count in decimal number>\n", argv[0]);
                exit(1);
        }
        else if(strncmp(argv[1], "/dev/mtd", 8) != 0)
@@ -50,8 +51,18 @@ int main(int argc, char *argv[])
                exit(1);
        }
 
-       mtdLockInfo.start = 0;
-       mtdLockInfo.length = mtdInfo.size;
+       if (argc > 2)
+               mtdLockInfo.start = strtol(argv[2], NULL, 0);
+       else
+               mtdLockInfo.start = 0;
+
+       if (argc > 3) {
+               count = strtol(argv[3], NULL, 0);
+               mtdLockInfo.length = mtdInfo.erasesize * count;
+       } else {
+               mtdLockInfo.length = mtdInfo.size - mtdInfo.erasesize;
+       }
+
        if(ioctl(fd, MEMUNLOCK, &mtdLockInfo))
        {
                fprintf(stderr, "Could not unlock MTD device: %s\n", argv[1]);
@@ -61,4 +72,3 @@ int main(int argc, char *argv[])
 
        return 0;
 }
-