ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-25 00:11:13 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

uboot-envtools: update to v2013.07

Browse Source 
SVN-Revision: 37857
This commit is contained in:
Luka Perkov 2013-08-29 23:06:29 +00:00
parent 7fc90889d5
commit cdd6361649
3 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/boot/uboot-envtools/Makefile
View File

@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=uboot-envtools PKG_NAME:=uboot-envtools
PKG_DISTNAME:=u-boot PKG_DISTNAME:=u-boot
PKG_VERSION:=2013.07-rc1 PKG_VERSION:=2013.07
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot
PKG_MD5SUM:=9b14d9a8981ce2e429956af7cc96996e PKG_MD5SUM:=8445162690052e6afd4b8f87af2bb557
PKG_BUILD_DIR:=$(BUILD_DIR)/u-boot-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/u-boot-$(PKG_VERSION)

13
package/boot/uboot-envtools/patches/110-add-support-for-MTD_ABSENT.patch → package/boot/uboot-envtools/patches/0001-fw_env-add-redundant-env-support-for-MTD_ABSENT.patch
View File

@ -1,13 +1,22 @@
tools/fw_env: add redundant env support for MTD_ABSENT From: Oliver Metz <oliver@freetz.org>
Subject: [PATCH v2 1/2] fw_env: add redundant env support for MTD_ABSENT
Signed-off-by: Oliver Metz <oliver@freetz.org> Signed-off-by: Oliver Metz <oliver@freetz.org>
Tested-by: Luka Perkov <luka@openwrt.org>
--- ---
v1 -> v2:
* correct spelling of redundant
http://lists.denx.de/pipermail/u-boot/2013-August/161694.html
http://patchwork.ozlabs.org/patch/270993/
tools/env/fw_env.c | 3 +++ tools/env/fw_env.c | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
--- a/tools/env/fw_env.c --- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c +++ b/tools/env/fw_env.c
@@ -1164,6 +1164,9 @@ int fw_env_open(void) @@ -1152,6 +1152,9 @@ int fw_env_open(void)
} else if (DEVTYPE(dev_current) == MTD_UBIVOLUME && } else if (DEVTYPE(dev_current) == MTD_UBIVOLUME &&
DEVTYPE(!dev_current) == MTD_UBIVOLUME) { DEVTYPE(!dev_current) == MTD_UBIVOLUME) {
environment.flag_scheme = FLAG_INCREMENTAL; environment.flag_scheme = FLAG_INCREMENTAL;

40
package/boot/uboot-envtools/patches/115-writing-environment-for-mtd-devices.patch → package/boot/uboot-envtools/patches/0002-fw_env-fix-writing-environment-for-mtd-devices.patch
View File

@ -1,9 +1,18 @@
tools/fw_env: fix writing environment for mtd devices From: Oliver Metz <oliver@freetz.org>
Subject: [PATCH v2 2/2] fw_env: fix writing environment for mtd devices
Signed-off-by: Oliver Metz <oliver@freetz.org> Signed-off-by: Oliver Metz <oliver@freetz.org>
Tested-by: Luka Perkov <luka@openwrt.org>
--- ---
tools/env/fw_env.c | 71 ++++++++++++++++++++++++++++++++----------------------
1 file changed, 42 insertions(+), 29 deletions(-) v1 -> v2:
* fix checkpatch.pl warnings
http://lists.denx.de/pipermail/u-boot/2013-August/161695.html
http://patchwork.ozlabs.org/patch/270994/
tools/env/fw_env.c | 70 ++++++++++++++++++++++++++++++++----------------------
1 file changed, 42 insertions(+), 28 deletions(-)
--- a/tools/env/fw_env.c --- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c +++ b/tools/env/fw_env.c
@ -23,12 +32,12 @@ Signed-off-by: Oliver Metz <oliver@freetz.org>
+ block_seek = 0; + block_seek = 0;
+ write_total = blocklen; + write_total = blocklen;
+ } else { + } else {
+ blocklen = DEVESIZE (dev); + blocklen = DEVESIZE(dev);
- top_of_range = ((DEVOFFSET(dev) / blocklen) + - top_of_range = ((DEVOFFSET(dev) / blocklen) +
- ENVSECTORS (dev)) * blocklen; - ENVSECTORS (dev)) * blocklen;
+ top_of_range = ((DEVOFFSET(dev) / blocklen) + + top_of_range = ((DEVOFFSET(dev) / blocklen) +
+ ENVSECTORS (dev)) * blocklen; + ENVSECTORS(dev)) * blocklen;
- erase_offset = (offset / blocklen) * blocklen; - erase_offset = (offset / blocklen) * blocklen;
+ erase_offset = (offset / blocklen) * blocklen; + erase_offset = (offset / blocklen) * blocklen;
@ -54,8 +63,8 @@ Signed-off-by: Oliver Metz <oliver@freetz.org>
- blocklen) * blocklen; - blocklen) * blocklen;
+ /* + /*
+ * Data size we actually write: from the start of the block + * Data size we actually write: from the start of the block
+ * to the start of the data, then count bytes of data, and to the + * to the start of the data, then count bytes of data, and
+ * end of the block + * to the end of the block
+ */ + */
+ write_total = ((block_seek + count + blocklen - 1) / + write_total = ((block_seek + count + blocklen - 1) /
+ blocklen) * blocklen; + blocklen) * blocklen;
@ -80,27 +89,26 @@ Signed-off-by: Oliver Metz <oliver@freetz.org>
- } - }
+ if (mtd_type != MTD_ABSENT) { + if (mtd_type != MTD_ABSENT) {
+ erase.start = blockstart; + erase.start = blockstart;
+ ioctl (fd, MEMUNLOCK, &erase); + ioctl(fd, MEMUNLOCK, &erase);
+ /* These do not need an explicit erase cycle */ + /* These do not need an explicit erase cycle */
+ if (mtd_type != MTD_DATAFLASH) + if (mtd_type != MTD_DATAFLASH)
+ if (ioctl (fd, MEMERASE, &erase) != 0) { + if (ioctl(fd, MEMERASE, &erase) != 0) {
+ fprintf (stderr, "MTD erase error on %s: %s\n", + fprintf(stderr,
+ DEVNAME (dev), + "MTD erase error on %s: %s\n",
+ strerror (errno)); + DEVNAME(dev), strerror(errno));
+ return -1; + return -1;
+ } + }
+ } + }
if (lseek (fd, blockstart, SEEK_SET) == -1) { if (lseek (fd, blockstart, SEEK_SET) == -1) {
fprintf (stderr, fprintf (stderr,
@@ -862,8 +875,8 @@ static int flash_write_buf (int dev, int @@ -863,7 +876,8 @@ static int flash_write_buf (int dev, int
DEVNAME (dev), strerror (errno));
return -1; return -1;
} }
-
- ioctl (fd, MEMLOCK, &erase); - ioctl (fd, MEMLOCK, &erase);
+ if (mtd_type != MTD_ABSENT) + if (mtd_type != MTD_ABSENT)
+ ioctl (fd, MEMLOCK, &erase); + ioctl(fd, MEMLOCK, &erase);
processed += blocklen; processed += blocklen;
block_seek = 0; block_seek = 0;