From f324bddaf74aac8f179bd15d2ba9beebcae90203 Mon Sep 17 00:00:00 2001 From: hauke Date: Sat, 9 Mar 2013 19:48:03 +0000 Subject: =?UTF-8?q?brcm47xx:=20add=20some=20more=20partition=20parser=20fi?= =?UTF-8?q?xes=20by=20Rafa=C5=82=20Mi=C5=82ecki?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35912 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../027-mtd-bcm47xxpart-get-nvram.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 target/linux/brcm47xx/patches-3.8/027-mtd-bcm47xxpart-get-nvram.patch (limited to 'target/linux/brcm47xx/patches-3.8/027-mtd-bcm47xxpart-get-nvram.patch') diff --git a/target/linux/brcm47xx/patches-3.8/027-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.8/027-mtd-bcm47xxpart-get-nvram.patch new file mode 100644 index 000000000..4cd78c201 --- /dev/null +++ b/target/linux/brcm47xx/patches-3.8/027-mtd-bcm47xxpart-get-nvram.patch @@ -0,0 +1,34 @@ +--- a/drivers/mtd/bcm47xxpart.c ++++ b/drivers/mtd/bcm47xxpart.c +@@ -65,6 +65,7 @@ static int bcm47xxpart_parse(struct mtd_ + int trx_part = -1; + int last_trx_part = -1; + int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, }; ++ bool found_nvram = false; + + if (blocksize <= 0x10000) + blocksize = 0x10000; +@@ -190,12 +191,23 @@ static int bcm47xxpart_parse(struct mtd_ + if (buf[0] == NVRAM_HEADER) { + bcm47xxpart_add_part(&parts[curr_part++], "nvram", + master->size - blocksize, 0); ++ found_nvram = true; + break; + } + } + + kfree(buf); + ++ if (!found_nvram) { ++ pr_err("can not find a nvram partition reserve last block\n"); ++ bcm47xxpart_add_part(&parts[curr_part++], "nvram_guess", ++ master->size - blocksize * 2, MTD_WRITEABLE); ++ for (i = 0; i < curr_part; i++) { ++ if (parts[i].size + parts[i].offset == master->size) ++ parts[i].offset -= blocksize * 2; ++ } ++ } ++ + /* + * Assume that partitions end at the beginning of the one they are + * followed by. -- cgit v1.2.3