From 4855417993c0f5d071fc001974f1473e2cf7be4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Tue, 17 Mar 2015 07:07:00 +0000 Subject: [PATCH] brcm47xx: rename (and refresh) MTD patch for safety "nvram" partition MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44854 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...et-nvram.patch => 400-mtd-bcm47xxpart-get-nvram.patch} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename target/linux/brcm47xx/patches-3.18/{027-mtd-bcm47xxpart-get-nvram.patch => 400-mtd-bcm47xxpart-get-nvram.patch} (80%) diff --git a/target/linux/brcm47xx/patches-3.18/027-mtd-bcm47xxpart-get-nvram.patch b/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch similarity index 80% rename from target/linux/brcm47xx/patches-3.18/027-mtd-bcm47xxpart-get-nvram.patch rename to target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch index 47f51ef8b0..df51191ad8 100644 --- a/target/linux/brcm47xx/patches-3.18/027-mtd-bcm47xxpart-get-nvram.patch +++ b/target/linux/brcm47xx/patches-3.18/400-mtd-bcm47xxpart-get-nvram.patch @@ -1,14 +1,14 @@ --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c -@@ -93,6 +93,7 @@ static int bcm47xxpart_parse(struct mtd_ +@@ -97,6 +97,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; -@@ -281,12 +282,23 @@ static int bcm47xxpart_parse(struct mtd_ + /* + * Some really old flashes (like AT45DB*) had smaller erasesize-s, but +@@ -300,12 +301,23 @@ static int bcm47xxpart_parse(struct mtd_ if (buf[0] == NVRAM_HEADER) { bcm47xxpart_add_part(&parts[curr_part++], "nvram", master->size - blocksize, 0);