sysmocom
/
openwrt
11
0
Fork 0
Code Pull Requests Releases Activity

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
This commit is contained in:
nbd 2014-09-02 17:14:24 +00:00
parent ae975c08ea
commit 955146573b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/system/mtd/src/trx.c
View File

@ -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);