brcm47xx: make bcm47xxpart patch apply after recent backports

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

SVN-Revision: 47806
master
Rafał Miłecki 9 years ago
parent b775b4d559
commit a8ac384746
  1. 6
      target/linux/brcm47xx/patches-4.1/400-mtd-bcm47xxpart-get-nvram.patch

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

Loading…
Cancel
Save