summaryrefslogtreecommitdiffstats
path: root/target/linux/bmips
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-07-01 10:50:36 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-07-05 20:32:37 +0200
commit79a82d7e8734bf9e5b7cd12efcda0f18b4ba378a (patch)
treec0574f0f882a13681762f310fb1ff280fe0e9fb9 /target/linux/bmips
parentb8b49066140eb810474531a48ee3807caa6a694c (diff)
downloadopenwrt-79a82d7e8734bf9e5b7cd12efcda0f18b4ba378a.tar.gz
openwrt-79a82d7e8734bf9e5b7cd12efcda0f18b4ba378a.tar.bz2
openwrt-79a82d7e8734bf9e5b7cd12efcda0f18b4ba378a.zip
kernel: bump 6.1 to 6.1.37
Manually rebased: generic/hack-6.1/220-arm-gc_sections.patch armsr/patches-6.1/221-armsr-disable_gc_sections_armv7.patch All other patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/bmips')
-rw-r--r--target/linux/bmips/patches-6.1/202-mips-bmips-tweak-Kconfig-options.patch4
-rw-r--r--target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch2
2 files changed, 3 insertions, 3 deletions
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 1c4a478148..36f8beb89f 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
@@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -273,19 +273,13 @@ config BMIPS_GENERIC
+@@ -274,19 +274,13 @@ config BMIPS_GENERIC
select SYNC_R4K
select COMMON_CLK
select BCM6345_L1_IRQ
@@ -33,7 +33,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
select SWAP_IO_SPACE
select USB_EHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
-@@ -295,6 +289,7 @@ config BMIPS_GENERIC
+@@ -296,6 +290,7 @@ config BMIPS_GENERIC
select HAVE_PCI
select PCI_DRIVERS_GENERIC
select FW_CFE
diff --git a/target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch b/target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch
index 66e8db4d01..e5c22bb17f 100644
--- a/target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch
+++ b/target/linux/bmips/patches-6.1/600-mips-bmips-add-pci-support.patch
@@ -14,7 +14,7 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -287,7 +287,6 @@ config BMIPS_GENERIC
+@@ -288,7 +288,6 @@ config BMIPS_GENERIC
select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
select HARDIRQS_SW_RESEND
select HAVE_PCI