aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm63xx
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-06-09 14:18:25 +0200
committerPetr Štetiar <ynezz@true.cz>2020-06-22 12:51:22 +0200
commite44e60b290fb346a4cdd5ca9b141abbcf61e80fe (patch)
tree7e46b387d0df829b07dbb13566b2f712a9279f48 /target/linux/bcm63xx
parentceeece9ffaa5a3a336505332c39794d76c08b2ca (diff)
downloadupstream-e44e60b290fb346a4cdd5ca9b141abbcf61e80fe.tar.gz
upstream-e44e60b290fb346a4cdd5ca9b141abbcf61e80fe.tar.bz2
upstream-e44e60b290fb346a4cdd5ca9b141abbcf61e80fe.zip
kernel: bump 5.4 to 5.4.48
Resolved merge conflict in the following patches: layerscape: 701-net-0213-dpaa2-eth-Add-CEETM-qdisc-support.patch ramips: 0013-owrt-hack-fix-mt7688-cache-issue.patch Refreshed patches, removed upstreamed patch: bcm63xx: 020-v5.8-mtd-rawnand-brcmnand-fix-hamming-oob-layout.patch Run tested: qemu-x86-64 Build tested: x86/64 Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/bcm63xx')
-rw-r--r--target/linux/bcm63xx/patches-5.4/020-v5.8-mtd-rawnand-brcmnand-fix-hamming-oob-layout.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/020-v5.8-mtd-rawnand-brcmnand-fix-hamming-oob-layout.patch b/target/linux/bcm63xx/patches-5.4/020-v5.8-mtd-rawnand-brcmnand-fix-hamming-oob-layout.patch
deleted file mode 100644
index 7e8713ea1d..0000000000
--- a/target/linux/bcm63xx/patches-5.4/020-v5.8-mtd-rawnand-brcmnand-fix-hamming-oob-layout.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 130bbde4809b011faf64f99dddc14b4b01f440c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Tue, 12 May 2020 09:57:32 +0200
-Subject: [PATCH] mtd: rawnand: brcmnand: fix hamming oob layout
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-First 2 bytes are used in large-page nand.
-
-Fixes: ef5eeea6e911 ("mtd: nand: brcm: switch to mtd_ooblayout_ops")
-Cc: stable@vger.kernel.org
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
-Link: https://lore.kernel.org/linux-mtd/20200512075733.745374-2-noltari@gmail.com
----
- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
---- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
-+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
-@@ -1019,11 +1019,14 @@ static int brcmnand_hamming_ooblayout_fr
- if (!section) {
- /*
- * Small-page NAND use byte 6 for BBI while large-page
-- * NAND use byte 0.
-+ * NAND use bytes 0 and 1.
- */
-- if (cfg->page_size > 512)
-- oobregion->offset++;
-- oobregion->length--;
-+ if (cfg->page_size > 512) {
-+ oobregion->offset += 2;
-+ oobregion->length -= 2;
-+ } else {
-+ oobregion->length--;
-+ }
- }
- }
-