From: Hauke Mehrtens Date: Sun, 14 May 2023 14:28:41 +0000 (+0200) Subject: bcm47xx: Refresh patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a24612cc0691c2f4780e25662a3c5f8a624420e0;p=openwrt%2Fstaging%2Fnbd.git bcm47xx: Refresh patches Refresh patches to make them cleanly apply. This problem was found by the github CI. Fixes: ecd9abc8c082 ("kernel: use upstream firmware patch for Broadcom's NVRAM") Signed-off-by: Hauke Mehrtens --- diff --git a/target/linux/bcm47xx/patches-5.15/820-wgt634u-nvram-fix.patch b/target/linux/bcm47xx/patches-5.15/820-wgt634u-nvram-fix.patch index bfcfae885f..82997ca65a 100644 --- a/target/linux/bcm47xx/patches-5.15/820-wgt634u-nvram-fix.patch +++ b/target/linux/bcm47xx/patches-5.15/820-wgt634u-nvram-fix.patch @@ -280,7 +280,7 @@ out the configuration than the in kernel cfe config reader. /* TODO: when nvram is on nand flash check for bad blocks first. */ /* Try every possible flash size and check for NVRAM at its end */ -@@ -172,6 +194,13 @@ int bcm47xx_nvram_getenv(const char *nam +@@ -190,6 +212,13 @@ int bcm47xx_nvram_getenv(const char *nam if (!name) return -EINVAL;