uboot-envtools: update to 2015.10

[openwrt.git] / package / boot / uboot-envtools / patches / 300-support-env-in-ubivol-chardev.patch

diff --git a/package/boot/uboot-envtools/patches/300-support-env-in-ubivol-chardev.patch b/package/boot/uboot-envtools/patches/300-support-env-in-ubivol-chardev.patch
index b778e8a..75d3804 100644 (file)
--- a/package/boot/uboot-envtools/patches/300-support-env-in-ubivol-chardev.patch
+++ b/package/boot/uboot-envtools/patches/300-support-env-in-ubivol-chardev.patch
@@ -27,7 +27,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
 --- a/tools/env/fw_env.c
 +++ b/tools/env/fw_env.c
-@@ -30,6 +30,9 @@
+@@ -31,6 +31,9 @@
  # include <mtd/mtd-user.h>
  #endif
  
@@ -37,7 +37,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  #include "fw_env.h"
  
  #include <aes.h>
-@@ -810,6 +813,11 @@ static int flash_write_buf (int dev, int
+@@ -811,6 +814,11 @@ static int flash_write_buf (int dev, int
        off_t top_of_range;     /* end of the last block we may use */
        loff_t blockstart;      /* running start of the current block -
                                   MEMGETBADBLOCK needs 64 bits */
@@ -49,7 +49,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        int rc;
  
        /*
-@@ -915,7 +923,30 @@ static int flash_write_buf (int dev, int
+@@ -916,7 +924,30 @@ static int flash_write_buf (int dev, int
                        continue;
                }
  
@@ -81,7 +81,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
                        erase.start = blockstart;
                        ioctl(fd, MEMUNLOCK, &erase);
                        /* These do not need an explicit erase cycle */
-@@ -932,7 +963,8 @@ static int flash_write_buf (int dev, int
+@@ -933,7 +964,8 @@ static int flash_write_buf (int dev, int
                        fprintf (stderr,
                                 "Seek error on %s: %s\n",
                                 DEVNAME (dev), strerror (errno));
@@ -91,7 +91,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
                }
  
  #ifdef DEBUG
-@@ -942,10 +974,11 @@ static int flash_write_buf (int dev, int
+@@ -943,10 +975,11 @@ static int flash_write_buf (int dev, int
                if (write (fd, data + processed, erasesize) != erasesize) {
                        fprintf (stderr, "Write error on %s: %s\n",
                                 DEVNAME (dev), strerror (errno));
@@ -105,7 +105,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
                        ioctl(fd, MEMLOCK, &erase);
  
                processed  += erasesize;
-@@ -956,6 +989,11 @@ static int flash_write_buf (int dev, int
+@@ -957,6 +990,11 @@ static int flash_write_buf (int dev, int
        if (write_total > count)
                free (data);
  
@@ -117,7 +117,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        return processed;
  }
  
-@@ -1067,12 +1105,8 @@ static int flash_read (int fd)
+@@ -1068,12 +1106,8 @@ static int flash_read (int fd)
  
        if (S_ISCHR(st.st_mode)) {
                rc = ioctl(fd, MEMGETINFO, &mtdinfo);
@@ -132,7 +132,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
                    mtdinfo.type != MTD_NANDFLASH &&
                    mtdinfo.type != MTD_DATAFLASH &&
                    mtdinfo.type != MTD_UBIVOLUME) {
-@@ -1080,6 +1114,28 @@ static int flash_read (int fd)
+@@ -1081,6 +1115,28 @@ static int flash_read (int fd)
                                 mtdinfo.type, DEVNAME(dev_current));
                        return -1;
                }