aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/800-v5.13-0004-firmware-bcm47xx_nvram-look-for-NVRAM-with-for-inste.patch
diff options
context:
space:
mode:
authorKabuli Chana <newtownBuild@gmail.com>2021-03-09 19:19:12 -0700
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-03-13 17:06:42 +0100
commit1cd098784eeb0e3ba0d05cd3e71ebf1a106138e9 (patch)
tree0dc8670f46a4f02d91f7aab6e6a79653fac5e84b /target/linux/generic/backport-5.10/800-v5.13-0004-firmware-bcm47xx_nvram-look-for-NVRAM-with-for-inste.patch
parente7fa97b326e596f64c4b9965c6f6c3773944c2c6 (diff)
downloadupstream-1cd098784eeb0e3ba0d05cd3e71ebf1a106138e9.tar.gz
upstream-1cd098784eeb0e3ba0d05cd3e71ebf1a106138e9.tar.bz2
upstream-1cd098784eeb0e3ba0d05cd3e71ebf1a106138e9.zip
kernel: bump 5.10 to 5.10.23
update kernel to 5.10.23, rebase patches, deleted upstreamed patch: target/linux/generic/backport-5.10/830-v5.12-0001-net-usb-qmi_wwan-support-ZTE-P685M-modem.patch compile / test - mvebu / mamba, rango Signed-off-by: Kabuli Chana <newtownBuild@gmail.com> [refresh again] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/generic/backport-5.10/800-v5.13-0004-firmware-bcm47xx_nvram-look-for-NVRAM-with-for-inste.patch')
-rw-r--r--target/linux/generic/backport-5.10/800-v5.13-0004-firmware-bcm47xx_nvram-look-for-NVRAM-with-for-inste.patch7
1 files changed, 1 insertions, 6 deletions
diff --git a/target/linux/generic/backport-5.10/800-v5.13-0004-firmware-bcm47xx_nvram-look-for-NVRAM-with-for-inste.patch b/target/linux/generic/backport-5.10/800-v5.13-0004-firmware-bcm47xx_nvram-look-for-NVRAM-with-for-inste.patch
index 0dadc601a9..059a13220b 100644
--- a/target/linux/generic/backport-5.10/800-v5.13-0004-firmware-bcm47xx_nvram-look-for-NVRAM-with-for-inste.patch
+++ b/target/linux/generic/backport-5.10/800-v5.13-0004-firmware-bcm47xx_nvram-look-for-NVRAM-with-for-inste.patch
@@ -16,11 +16,9 @@ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
drivers/firmware/broadcom/bcm47xx_nvram.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
-diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c
-index 09f51b95849e..1d2271b1e07a 100644
--- a/drivers/firmware/broadcom/bcm47xx_nvram.c
+++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
-@@ -93,15 +93,13 @@ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_siz
+@@ -93,15 +93,13 @@ static int bcm47xx_nvram_find_and_copy(v
}
/* TODO: when nvram is on nand flash check for bad blocks first. */
@@ -37,6 +35,3 @@ index 09f51b95849e..1d2271b1e07a 100644
}
/* Try embedded NVRAM at 4 KB and 1 KB as last resorts */
---
-2.26.2
-