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-0003-firmware-bcm47xx_nvram-extract-code-copying-NVRAM.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-0003-firmware-bcm47xx_nvram-extract-code-copying-NVRAM.patch')
| -rw-r--r-- | target/linux/generic/backport-5.10/800-v5.13-0003-firmware-bcm47xx_nvram-extract-code-copying-NVRAM.patch | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/target/linux/generic/backport-5.10/800-v5.13-0003-firmware-bcm47xx_nvram-extract-code-copying-NVRAM.patch b/target/linux/generic/backport-5.10/800-v5.13-0003-firmware-bcm47xx_nvram-extract-code-copying-NVRAM.patch index 67ec157f5e..a1351f1197 100644 --- a/target/linux/generic/backport-5.10/800-v5.13-0003-firmware-bcm47xx_nvram-extract-code-copying-NVRAM.patch +++ b/target/linux/generic/backport-5.10/800-v5.13-0003-firmware-bcm47xx_nvram-extract-code-copying-NVRAM.patch @@ -15,15 +15,12 @@ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> drivers/firmware/broadcom/bcm47xx_nvram.c | 43 +++++++++++++---------- 1 file changed, 25 insertions(+), 18 deletions(-) -diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c -index 99f3ec180be6..09f51b95849e 100644 --- a/drivers/firmware/broadcom/bcm47xx_nvram.c +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c -@@ -54,12 +54,35 @@ static u32 find_nvram_size(void __iomem *end) - return 0; +@@ -55,11 +55,34 @@ static u32 find_nvram_size(void __iomem } -+/** + /** + * bcm47xx_nvram_copy - copy NVRAM to internal buffer + */ +static void bcm47xx_nvram_copy(void __iomem *nvram_start, size_t res_size) @@ -47,7 +44,7 @@ index 99f3ec180be6..09f51b95849e 100644 + nvram_len = copy_size; +} + - /** ++/** * bcm47xx_nvram_find_and_copy - find NVRAM on flash mapping & copy it */ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_size) @@ -56,7 +53,7 @@ index 99f3ec180be6..09f51b95849e 100644 size_t flash_size; size_t offset; u32 size; -@@ -95,23 +118,7 @@ static int bcm47xx_nvram_find_and_copy(void __iomem *flash_start, size_t res_siz +@@ -95,23 +118,7 @@ static int bcm47xx_nvram_find_and_copy(v return -ENXIO; found: @@ -81,6 +78,3 @@ index 99f3ec180be6..09f51b95849e 100644 return 0; } --- -2.26.2 - |