Merge remote-tracking branch 'openwrt'

LiBwrt-op · Apr 16, 2024 · a333578 · a333578
2 parents 9eb5f5c + 12137cb
commit a333578
Show file tree

Hide file tree

Showing 17 changed files with 2 additions and 1,224 deletions.
diff --git a/package/libs/elfutils/patches/007-fix-missing-typedef.patch b/package/libs/elfutils/patches/007-fix-missing-typedef.patch
diff --git a/target/linux/generic/config-6.1 b/target/linux/generic/config-6.1
@@ -2347,6 +2347,7 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
+# CONFIG_GPIO_VF610 is not set
 # CONFIG_GPIO_VIRTIO is not set
 # CONFIG_GPIO_VX855 is not set
 # CONFIG_GPIO_WATCHDOG is not set

diff --git a/target/linux/pistachio/Makefile b/target/linux/pistachio/Makefile
@@ -12,8 +12,7 @@ CPU_TYPE:=24kc
 CPU_SUBTYPE:=24kf
 SUBTARGETS:=generic
 
-KERNEL_PATCHVER:=5.15
-KERNEL_TESTING_PATCHVER:=6.1
+KERNEL_PATCHVER:=6.1
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/pistachio/config-5.15 b/target/linux/pistachio/config-5.15