summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-12-01 16:32:32 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-12-01 16:32:32 +0000
commit86b4d5ef68ca77ff6724ebb9bddd6b93239c87fc (patch)
treec1bd36d65d994fda2427d227c1801b1dd26d8388
parent95d35235678ab8b3ff3ef3b304e6e678e451be4b (diff)
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38973 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm47xx/base-files/etc/uci-defaults/09_fix_crc2
-rw-r--r--target/linux/brcm47xx/base-files/lib/upgrade/platform.sh2
-rw-r--r--target/linux/brcm47xx/patches-3.10/028-mtd-bcm47xxpart-use-old-part-names.patch20
3 files changed, 2 insertions, 22 deletions
diff --git a/target/linux/brcm47xx/base-files/etc/uci-defaults/09_fix_crc b/target/linux/brcm47xx/base-files/etc/uci-defaults/09_fix_crc
index 598f45e81c..346a532998 100644
--- a/target/linux/brcm47xx/base-files/etc/uci-defaults/09_fix_crc
+++ b/target/linux/brcm47xx/base-files/etc/uci-defaults/09_fix_crc
@@ -4,4 +4,4 @@
#
#
-mtd fixtrx linux
+mtd fixtrx firmware
diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
index 9921cf571a..644f3c1e66 100644
--- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
@@ -1,4 +1,4 @@
-PART_NAME=linux
+PART_NAME=firmware
platform_check_image() {
[ "$ARGC" -gt 1 ] && return 1
diff --git a/target/linux/brcm47xx/patches-3.10/028-mtd-bcm47xxpart-use-old-part-names.patch b/target/linux/brcm47xx/patches-3.10/028-mtd-bcm47xxpart-use-old-part-names.patch
deleted file mode 100644
index e43bb87283..0000000000
--- a/target/linux/brcm47xx/patches-3.10/028-mtd-bcm47xxpart-use-old-part-names.patch
+++ /dev/null
@@ -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++;
-