tools/env/fw_printenv: Make redundant env work on locked flashes also

The invalidation of the old environment instance did not work for flashes
supporting hardware locking.  Now we unlock/lock around this update also.

Signed-off-by: Detlev Zundel <dzu@denx.de>

diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index 04f3bf0a43739165275bd19bf946e2211233b127..8ff70522430dee31f776a6f31c8eae7442df83de 100644 (file)
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000-2008
+ * (C) Copyright 2000-2010
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * (C) Copyright 2008
@@ -899,7 +899,10 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count,
 static int flash_flag_obsolete (int dev, int fd, off_t offset)
 {
        int rc;
+       struct erase_info_user erase;
 
+       erase.start  = DEVOFFSET (dev);
+       erase.length = DEVESIZE (dev);
        /* This relies on the fact, that obsolete_flag == 0 */
        rc = lseek (fd, offset, SEEK_SET);
        if (rc < 0) {
@@ -907,7 +910,9 @@ static int flash_flag_obsolete (int dev, int fd, off_t offset)
                         DEVNAME (dev));
                return rc;
        }
+       ioctl (fd, MEMUNLOCK, &erase);
        rc = write (fd, &obsolete_flag, sizeof (obsolete_flag));
+       ioctl (fd, MEMLOCK, &erase);
        if (rc < 0)
                perror ("Could not set obsolete flag");