diff options
author | Kabuli Chana <newtownBuild@gmail.com> | 2021-03-09 19:19:12 -0700 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-03-13 17:06:42 +0100 |
commit | 1cd098784eeb0e3ba0d05cd3e71ebf1a106138e9 (patch) | |
tree | 0dc8670f46a4f02d91f7aab6e6a79653fac5e84b /target/linux/generic/backport-5.10/800-v5.13-0005-firmware-bcm47xx_nvram-inline-code-checking-NVRAM-si.patch | |
parent | e7fa97b326e596f64c4b9965c6f6c3773944c2c6 (diff) | |
download | upstream-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-0005-firmware-bcm47xx_nvram-inline-code-checking-NVRAM-si.patch')
-rw-r--r-- | target/linux/generic/backport-5.10/800-v5.13-0005-firmware-bcm47xx_nvram-inline-code-checking-NVRAM-si.patch | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/generic/backport-5.10/800-v5.13-0005-firmware-bcm47xx_nvram-inline-code-checking-NVRAM-si.patch b/target/linux/generic/backport-5.10/800-v5.13-0005-firmware-bcm47xx_nvram-inline-code-checking-NVRAM-si.patch index 065543184f..21d250049e 100644 --- a/target/linux/generic/backport-5.10/800-v5.13-0005-firmware-bcm47xx_nvram-inline-code-checking-NVRAM-si.patch +++ b/target/linux/generic/backport-5.10/800-v5.13-0005-firmware-bcm47xx_nvram-inline-code-checking-NVRAM-si.patch @@ -19,11 +19,9 @@ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> drivers/firmware/broadcom/bcm47xx_nvram.c | 25 +++++++---------------- 1 file changed, 7 insertions(+), 18 deletions(-) -diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c -index 1d2271b1e07a..bd235833b687 100644 --- a/drivers/firmware/broadcom/bcm47xx_nvram.c +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c -@@ -42,18 +42,6 @@ static bool bcm47xx_nvram_is_valid(void __iomem *nvram) +@@ -42,18 +42,6 @@ static bool bcm47xx_nvram_is_valid(void return ((struct nvram_header *)nvram)->magic == NVRAM_MAGIC; } @@ -42,7 +40,7 @@ index 1d2271b1e07a..bd235833b687 100644 /** * bcm47xx_nvram_copy - copy NVRAM to internal buffer */ -@@ -85,7 +73,7 @@ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_siz +@@ -85,7 +73,7 @@ static int bcm47xx_nvram_find_and_copy(v { size_t flash_size; size_t offset; @@ -51,7 +49,7 @@ index 1d2271b1e07a..bd235833b687 100644 if (nvram_len) { pr_warn("nvram already initialized\n"); -@@ -93,12 +81,13 @@ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_siz +@@ -93,12 +81,13 @@ static int bcm47xx_nvram_find_and_copy(v } /* TODO: when nvram is on nand flash check for bad blocks first. */ @@ -70,6 +68,3 @@ index 1d2271b1e07a..bd235833b687 100644 } } --- -2.26.2 - |