summaryrefslogtreecommitdiffstats
path: root/target/linux/bmips
diff options
context:
space:
mode:
authorRobert Marko <robimarko@gmail.com>2023-05-31 21:02:52 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2023-06-02 21:23:12 +0200
commitb81045a81848ad2f51577d61c2379f27d50d71d9 (patch)
tree9c15aa5d3736340c8da625c7c71f1865021d3f60 /target/linux/bmips
parenteffccdd444a956afc5493ef8f1c79a7e7ffa8490 (diff)
downloadopenwrt-b81045a81848ad2f51577d61c2379f27d50d71d9.tar.gz
openwrt-b81045a81848ad2f51577d61c2379f27d50d71d9.tar.bz2
openwrt-b81045a81848ad2f51577d61c2379f27d50d71d9.zip
kernel: bump 6.1 to 6.1.31
All patches automatically rebased. Build system: x86_64/Fedora 38 Build-tested: ipq807x/Qnap 301W, ipq807x/Dynalink DL-WRX36 Run-tested: ipq807x/Qnap 301W, ipq807x/Dynalink DL-WRX36 Signed-off-by: Robert Marko <robimarko@gmail.com>
Diffstat (limited to 'target/linux/bmips')
-rw-r--r--target/linux/bmips/patches-6.1/100-irqchip-add-support-for-bcm6345-style-external-inter.patch2
-rw-r--r--target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch9
2 files changed, 6 insertions, 5 deletions
diff --git a/target/linux/bmips/patches-6.1/100-irqchip-add-support-for-bcm6345-style-external-inter.patch b/target/linux/bmips/patches-6.1/100-irqchip-add-support-for-bcm6345-style-external-inter.patch
index 15d44b34d1..42aec229f9 100644
--- a/target/linux/bmips/patches-6.1/100-irqchip-add-support-for-bcm6345-style-external-inter.patch
+++ b/target/linux/bmips/patches-6.1/100-irqchip-add-support-for-bcm6345-style-external-inter.patch
@@ -50,7 +50,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+};
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
-@@ -108,6 +108,10 @@ config I8259
+@@ -109,6 +109,10 @@ config I8259
bool
select IRQ_DOMAIN
diff --git a/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch b/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch
index 3e0c67d9a4..e85056aee7 100644
--- a/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch
+++ b/target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch
@@ -41,9 +41,9 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
help
Build a generic DT-based kernel image that boots on select
BCM33xx cable modem chips, BCM63xx DSL chips, and BCM7xxx set-top
---- a/drivers/irqchip/Kconfig 2023-05-30 19:59:04.671531242 +0200
-+++ b/drivers/irqchip/Kconfig 2023-05-30 19:59:55.203880697 +0200
-@@ -121,7 +121,6 @@ config BCM6345_L1_IRQ
+--- a/drivers/irqchip/Kconfig
++++ b/drivers/irqchip/Kconfig
+@@ -122,7 +122,6 @@ config BCM6345_L1_IRQ
config BCM7038_L1_IRQ
tristate "Broadcom STB 7038-style L1/L2 interrupt controller driver"
depends on ARCH_BRCMSTB || BMIPS_GENERIC
@@ -51,7 +51,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
select GENERIC_IRQ_CHIP
select IRQ_DOMAIN
select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP
-@@ -129,14 +128,12 @@ config BCM7038_L1_IRQ
+@@ -130,14 +129,12 @@ config BCM7038_L1_IRQ
config BCM7120_L2_IRQ
tristate "Broadcom STB 7120-style L2 interrupt controller driver"
depends on ARCH_BRCMSTB || BMIPS_GENERIC
@@ -65,3 +65,4 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
- default ARCH_BCM2835 || ARCH_BRCMSTB || BMIPS_GENERIC
select GENERIC_IRQ_CHIP
select IRQ_DOMAIN
+