diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-09-02 17:14:24 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-09-02 17:14:24 +0000 |
| commit | f592d54ee488c6c5581da43d4a3f6d4e6c719462 (patch) | |
| tree | 44bd990b59cbd9812a74a27fd51f9a401ae35793 | |
| parent | 271dca5342b3672676905f49e4c2663fdc72a2e6 (diff) | |
| download | upstream-f592d54ee488c6c5581da43d4a3f6d4e6c719462.tar.gz upstream-f592d54ee488c6c5581da43d4a3f6d4e6c719462.tar.bz2 upstream-f592d54ee488c6c5581da43d4a3f6d4e6c719462.zip | |
mtd: Fix trx check after partition rename ("linux" to "firmware")
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>
Backport of r38973
Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
Backport of r42403
git-svn-id: svn://svn.openwrt.org/openwrt/branches/barrier_breaker@42404 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/system/mtd/src/trx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/system/mtd/src/trx.c b/package/system/mtd/src/trx.c index 65c24404c2..86d62fc19e 100644 --- a/package/system/mtd/src/trx.c +++ b/package/system/mtd/src/trx.c @@ -107,7 +107,7 @@ trx_check(int imagefd, const char *mtd, char *buf, int *len) const struct trx_header *trx = (const struct trx_header *) buf; int fd; - if (strcmp(mtd, "linux") != 0) + if (strcmp(mtd, "firmware") != 0) return 1; *len = read(imagefd, buf, 32); |