brcm47xx: use "firmware" partition name

Some time ago, after switching to the mainline bcm47xxpart driver
following patch has been applied:

commit 03cef8725d2062335ffc3de50fc037b294fd458c
Author: hauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date:   Sat Apr 6 22:22:26 2013 +0000

    brcm47xx: use old partition names again for kernel 3.8

    This fixes sysupgrade. The partition names are used all over the Internet in various howtos.

    Thank you russell for spotting this problem.

I propose to revert this change and make sysupgrade use "firmware"
instead. This makes brcm47xx compatible with widely used ar71xx and
after all "firmware" sounds like a much better name for... the firmware.

This change doesn't affect "sysupgrade" usage, because it never takes a
partition name as a parameter. This change only affects users using mtd
tool directly. Hopefully there are not many howtos using "mtd" command.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 38973
This commit is contained in:
Hauke Mehrtens 2013-12-01 16:32:32 +00:00
parent f1ef0b92be
commit d7ebbd0ac7
3 changed files with 2 additions and 22 deletions

View File

@ -4,4 +4,4 @@
# #
# #
mtd fixtrx linux mtd fixtrx firmware

View File

@ -1,4 +1,4 @@
PART_NAME=linux PART_NAME=firmware
platform_check_image() { platform_check_image() {
[ "$ARGC" -gt 1 ] && return 1 [ "$ARGC" -gt 1 ] && return 1

View File

@ -1,20 +0,0 @@
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -134,7 +134,7 @@ static int bcm47xxpart_parse(struct mtd_
trx = (struct trx_header *)buf;
trx_part = curr_part;
- bcm47xxpart_add_part(&parts[curr_part++], "firmware",
+ bcm47xxpart_add_part(&parts[curr_part++], "linux",
offset, 0);
i = 0;
@@ -147,7 +147,7 @@ static int bcm47xxpart_parse(struct mtd_
i++;
}
- bcm47xxpart_add_part(&parts[curr_part++], "linux",
+ bcm47xxpart_add_part(&parts[curr_part++], "kernel",
offset + trx->offset[i], 0);
i++;