1) Put sanity checks in one place
2) Respect provided offset
3) Read only as much data as needed for MD5 calculation
Thanks to the last change this is a great speedup and memory saver. On
devices with NAND flash we were allocating & reading about 128 MiB while
something about 8 MiB is enough.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r49309
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49313 3c298f89-4303-0410-b956-a3cf2f4a3e73
This buf is only used in this function now, so lets move it there.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r49308
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49312 3c298f89-4303-0410-b956-a3cf2f4a3e73
This will allow separating first block buffer from a buffer used for MD5
calculation.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r49307
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49311 3c298f89-4303-0410-b956-a3cf2f4a3e73
This allows us to drop some extra offset calculations and simplifies
code a bit.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r49306
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49310 3c298f89-4303-0410-b956-a3cf2f4a3e73
This avoid long (and unneeded) process of reading all data in case of
running on MTD not containig Seama entity.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r49304
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49305 3c298f89-4303-0410-b956-a3cf2f4a3e73
On platforms supporting both: TRX and Seama calling "fixtrx" was
resulting in trying to fix Seama as well.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r49301
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49303 3c298f89-4303-0410-b956-a3cf2f4a3e73
This makes code style consistent across the whole file.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r49300
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49302 3c298f89-4303-0410-b956-a3cf2f4a3e73
There are D-Link bcm53xx devices using Seama format.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r48521
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@49169 3c298f89-4303-0410-b956-a3cf2f4a3e73
The u-boot boot counter was never reset after a successful boot,
which sometimes could make some variables become out of sync.
This patch adds support for the boot counter and enables
auto_recovery unconditionally.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Rob Mosher <nyt-openwrt@countercultured.net>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46691 3c298f89-4303-0410-b956-a3cf2f4a3e73
trx.c in mtd would not include endian.h, so on systems that do not have
this header implicitly included from the other headers (like musl), both
__BYTE_ORDER and __BIG_ENDIAN would be undefined and thus 0, leading to
it always presuming a big-endian system. this would lead to issues when
running mtd fixtrx on little-endian systems, as it would never recognize
the TRX magic as result of the broken STORE32_LE() macro.
Signed-off-by: Shiz <hi@shiz.me>
Tested-by: Shiz <hi@shiz.me>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45896 3c298f89-4303-0410-b956-a3cf2f4a3e73
In mtd_verify(), the return value of md5sum() has been
interpreted as error if nonzero, while the function
returns number of processed bytes, which caused
mtd_verify() to always fail.
This patch fixes error checking to interpret only
negative values as errors.
Signed-off-by: Zefir Kurtisi <zefir.kurtisi@neratec.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44605 3c298f89-4303-0410-b956-a3cf2f4a3e73
Remove the need for the header file to be exported - we don't need most
of it anyway; all we care about are the offset of the rootfs length and
header crc fields.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44557 3c298f89-4303-0410-b956-a3cf2f4a3e73
this can be used on nand flashes and will skip bad blocks and run ecc on the
read data before dumping it.
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43500 3c298f89-4303-0410-b956-a3cf2f4a3e73
mtd.c:544:7: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 3 has type ‘ssize_t’ [-Wformat]
mtd.c:602:1: warning: label ‘done’ defined but not used [-Wunused-label]
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43383 3c298f89-4303-0410-b956-a3cf2f4a3e73
turns out that r43155 adds duplicate info.
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43167 3c298f89-4303-0410-b956-a3cf2f4a3e73
Note, that licensing stuff is a nightmare: many packages does not clearly
state their licenses, and often multiple source files are simply copied
together - each with different licensing information in the file headers.
I tried hard to ensure, that the license information extracted into the OpenWRT's
makefiles fit the "spirit" of the packages, e.g. such small packages which
come without a dedicated source archive "inherites" the OpenWRT's own license
in my opinion.
However, I can not garantee that I always picked the correct information
and/or did not miss license information.
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43155 3c298f89-4303-0410-b956-a3cf2f4a3e73
Without running fixtrx the image will not boot at the second time,
because the CRC the boot loader check is invalid at that time.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42639 3c298f89-4303-0410-b956-a3cf2f4a3e73
On brcm47xx (Huawei E970), I noticed that sysupgrade now tries to flash trx images which don't fit into the flash, resulting in non-booting system.
I found that mtd does trx size checking only when flashing to a partition called "linux". This patch changes this to be "firmware".
This matches the following patch which changed partition name in bcm47xxpart.c driver to "firmware":
commit 86b4d5ef68ca77ff6724ebb9bddd6b93239c87fc
Author: hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun Dec 1 16:32:32 2013 +0000
brcm47xx: use "firmware" partition name
...
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38973 3c298f89-4303-0410-b956-a3cf2f4a3e73
Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42403 3c298f89-4303-0410-b956-a3cf2f4a3e73
NAND flash is very likely to contain bad blocks.
Currently, mtd and therefore sysupgrade fails when it encounters a single bad block, potentially leaving an unbootable system.
This patch allows the mtd utility to skip bad blocks in NAND flash and complete sysupgrade successfully.
Patch by: Matthew Redfearn <matt.redfearn@nxp.com>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40021 3c298f89-4303-0410-b956-a3cf2f4a3e73
The current implementation of mtd will not append the backup
file created by sysupgrade to the correct partition, as mtd will append
the data to first jffs2 partition it finds. As the kernel is also
stored on a jffs2 partition (which resides before the overlay
partition), the data will be appended to this partition.
To fix this problem, a new option
-s <number> skip the first n bytes when appending data to the jffs2 partiton, defaults to "0"
is added to mtd.
Signed-off-by: Peter Wagner <tripolar@gmx.at>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38807 3c298f89-4303-0410-b956-a3cf2f4a3e73
It will be used for the WD My Net N600.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38073 3c298f89-4303-0410-b956-a3cf2f4a3e73
Rafał Miłecki
Imre Kaloz
Felix Fietkau
John Crispin
Jonas Gorski
Steven Barth
Hauke Mehrtens
Gabor Juhos