brcm47xx: image: switch Motorola devices to the new building system
[librecmc/librecmc.git] / target / linux / brcm47xx / patches-4.1 / 400-mtd-bcm47xxpart-get-nvram.patch
index df51191ad88239b33ffb1f1e9555f514c7c47104..4fb8a87d4c2d2df7fd3e45eed1cd84b3cd06e93e 100644 (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;
+@@ -127,6 +127,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_
+@@ -334,12 +335,23 @@ static int bcm47xxpart_parse(struct mtd_
                if (buf[0] == NVRAM_HEADER) {
                        bcm47xxpart_add_part(&parts[curr_part++], "nvram",
                                             master->size - blocksize, 0);