domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

brcm47xx: make bcm47xxpart patch apply after recent backports

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

SVN-Revision: 47806
This commit is contained in:
Rafał Miłecki
2015-12-07 18:38:20 +00:00
parent b775b4d559
commit a8ac384746
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/brcm47xx/patches-4.1/400-mtd-bcm47xxpart-get-nvram.patch
View File

@@ -1,14 +1,14 @@
--- a/drivers/mtd/bcm47xxpart.c
+++ b/drivers/mtd/bcm47xxpart.c
@@ -97,6 +97,7 @@ static int bcm47xxpart_parse(struct mtd_
int trx_part = -1;
@@ -100,6 +100,7 @@ static int bcm47xxpart_parse(struct mtd_
int last_trx_part = -1;
int possible_nvram_sizes[] = { 0x8000, 0xF000, 0x10000, };
int err;
+ bool found_nvram = false;
/*
* Some really old flashes (like AT45DB*) had smaller erasesize-s, but
@@ -300,12 +301,23 @@ static int bcm47xxpart_parse(struct mtd_
@@ -306,12 +307,23 @@ static int bcm47xxpart_parse(struct mtd_
if (buf[0] == NVRAM_HEADER) {
bcm47xxpart_add_part(&parts[curr_part++], "nvram",
master->size - blocksize, 0);