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-0001-firmware-bcm47xx_nvram-rename-finding-function-and-i.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-0001-firmware-bcm47xx_nvram-rename-finding-function-and-i.patch')
-rw-r--r-- | target/linux/generic/backport-5.10/800-v5.13-0001-firmware-bcm47xx_nvram-rename-finding-function-and-i.patch | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/generic/backport-5.10/800-v5.13-0001-firmware-bcm47xx_nvram-rename-finding-function-and-i.patch b/target/linux/generic/backport-5.10/800-v5.13-0001-firmware-bcm47xx_nvram-rename-finding-function-and-i.patch index 711ec28f52..19938704b7 100644 --- a/target/linux/generic/backport-5.10/800-v5.13-0001-firmware-bcm47xx_nvram-rename-finding-function-and-i.patch +++ b/target/linux/generic/backport-5.10/800-v5.13-0001-firmware-bcm47xx_nvram-rename-finding-function-and-i.patch @@ -17,11 +17,9 @@ Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> drivers/firmware/broadcom/bcm47xx_nvram.c | 24 ++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) -diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c -index 835ece9c00f1..b04007adc79f 100644 --- a/drivers/firmware/broadcom/bcm47xx_nvram.c +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c -@@ -48,11 +48,13 @@ static u32 find_nvram_size(void __iomem *end) +@@ -48,11 +48,13 @@ static u32 find_nvram_size(void __iomem return 0; } @@ -38,7 +36,7 @@ index 835ece9c00f1..b04007adc79f 100644 u32 size; if (nvram_len) { -@@ -61,25 +63,25 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim) +@@ -61,25 +63,25 @@ static int nvram_find_and_copy(void __io } /* TODO: when nvram is on nand flash check for bad blocks first. */ @@ -71,7 +69,7 @@ index 835ece9c00f1..b04007adc79f 100644 if (header->magic == NVRAM_MAGIC) { size = NVRAM_SPACE; goto found; -@@ -124,7 +126,7 @@ int bcm47xx_nvram_init_from_mem(u32 base, u32 lim) +@@ -124,7 +126,7 @@ int bcm47xx_nvram_init_from_mem(u32 base if (!iobase) return -ENOMEM; @@ -80,6 +78,3 @@ index 835ece9c00f1..b04007adc79f 100644 iounmap(iobase); --- -2.26.2 - |