diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-12-07 09:31:52 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-12-07 09:31:52 +0000 |
| commit | 3333f75cafc6d45491eeb2b104a01bf8cb90cd78 (patch) | |
| tree | 14e93f25f45cff9c2282d267a54ee2a37d3a9a5c /target/linux/bcm53xx/patches-4.1 | |
| parent | e4fd0a41fd4653b22b9dda18c0073369ccae07b4 (diff) | |
| download | upstream-3333f75cafc6d45491eeb2b104a01bf8cb90cd78.tar.gz upstream-3333f75cafc6d45491eeb2b104a01bf8cb90cd78.tar.bz2 upstream-3333f75cafc6d45491eeb2b104a01bf8cb90cd78.zip | |
kernel: add bcm47xxpart patches sent for 4.5 merge window
This replaces old bcm53xx patch for scanning whole flash and makes
bcm47xxpart compatible with NAND.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 47800
Diffstat (limited to 'target/linux/bcm53xx/patches-4.1')
2 files changed, 3 insertions, 34 deletions
diff --git a/target/linux/bcm53xx/patches-4.1/400-mtd-bcm47xxpart-scan-whole-flash-on-ARCH_BCM_5301X.patch b/target/linux/bcm53xx/patches-4.1/400-mtd-bcm47xxpart-scan-whole-flash-on-ARCH_BCM_5301X.patch deleted file mode 100644 index ccdb28b54d..0000000000 --- a/target/linux/bcm53xx/patches-4.1/400-mtd-bcm47xxpart-scan-whole-flash-on-ARCH_BCM_5301X.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d658c21d6697293a928434fd6ac19264b5a8948d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> -Date: Fri, 30 Jan 2015 08:25:54 +0100 -Subject: [PATCH] mtd: bcm47xxpart: scan whole flash on ARCH_BCM_5301X -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Rafał Miłecki <zajec5@gmail.com> ---- - drivers/mtd/bcm47xxpart.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/drivers/mtd/bcm47xxpart.c -+++ b/drivers/mtd/bcm47xxpart.c -@@ -120,9 +120,15 @@ static int bcm47xxpart_parse(struct mtd_ - /* Parse block by block looking for magics */ - for (offset = 0; offset <= master->size - blocksize; - offset += blocksize) { -+#ifndef CONFIG_ARCH_BCM_5301X -+ /* -+ * ARM routers may have partitions in higher memory. E.g. -+ * Netgear R8000 has board_data at 0x2600000. -+ */ - /* Nothing more in higher memory */ - if (offset >= 0x2000000) - break; -+#endif - - if (curr_part >= BCM47XXPART_MAX_PARTS) { - pr_warn("Reached maximum number of partitions, scanning stopped!\n"); diff --git a/target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch b/target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch index c1dfa92013..774a186263 100644 --- a/target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch +++ b/target/linux/bcm53xx/patches-4.1/901-mtd-bcm47xxpart-workaround-for-Asus-RT-AC87U-asus-pa.patch @@ -22,7 +22,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> #include <uapi/linux/magic.h> -@@ -135,6 +136,17 @@ static int bcm47xxpart_parse(struct mtd_ +@@ -132,6 +133,17 @@ static int bcm47xxpart_parse(struct mtd_ break; } @@ -38,5 +38,5 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> + } + /* Read beginning of the block */ - if (mtd_read(master, offset, BCM47XXPART_BYTES_TO_READ, - &bytes_read, (uint8_t *)buf) < 0) { + err = mtd_read(master, offset, BCM47XXPART_BYTES_TO_READ, + &bytes_read, (uint8_t *)buf); |