update

devices/bcm27xx_bcm2710/.config

@@ -6,7 +6,5 @@ CONFIG_TARGET_bcm27xx_bcm2710_DEVICE_rpi-3=y
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 
-CONFIG_PACKAGE_kmod-rtl8821cu=m
-CONFIG_PACKAGE_kmod-rtl88x2bu=m
 
 

devices/bcm27xx_bcm2711/.config

@@ -6,8 +6,5 @@ CONFIG_TARGET_bcm27xx_bcm2711_DEVICE_rpi-4=y
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 
-CONFIG_PACKAGE_kmod-rtl8821cu=m
-CONFIG_PACKAGE_kmod-rtl88x2bu=m
-
 CONFIG_PACKAGE_kmod-of-mdio=n
 

devices/common/.config

@@ -92,11 +92,11 @@ CONFIG_KERNEL_EXT4_FS_POSIX_ACL=y
 CONFIG_KERNEL_EXT4_FS_SECURITY=y
 CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y
 
-CONFIG_PACKAGE_kmod-rtl8821cu=n
-CONFIG_PACKAGE_kmod-rtl88x2bu=n
-
 CONFIG_PACKAGE_kmod-rtl8189es=n
 
+CONFIG_PACKAGE_kmod-sprd_pcie=n
+CONFIG_PACKAGE_kmod-drm-nouveau=n
+
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
 

devices/common/diy.sh

@@ -42,14 +42,21 @@ sed -i "s/192.168.1/10.0.0/" package/base-files/files/bin/config_generate
 git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/hack-5.15
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch
 
-curl -sfL https://raw.githubusercontent.com/openwrt/openwrt/main/package/kernel/mac80211/realtek.mk -o package/kernel/mac80211/realtek.mk
-
 sed -i "s/CONFIG_WERROR=y/CONFIG_WERROR=n/" target/linux/generic/config-5.15
 
-grep -q "23.05" include/version.mk && [ -d package/kernel/mt76 ] && {
+sed -i "s/no-lto,$/no-lto no-mold,$/" include/package.mk
+
+[ -d package/kernel/mt76 ] && {
 mkdir package/kernel/mt76/patches
 curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch -o package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch
-} || rm -rf devices/common/patches/mt7922.patch
+}
+
+rm -rf feeds/packages/libs/libpfring
+cd feeds/packages
+git_clone_path master https://github.com/openwrt/packages libs/libpfring
+cd -
+
+rm -rf package/network/utils/xdp-tools
 
 grep -q "1.8.8" package/network/utils/iptables/Makefile && {
 rm -rf package/network/utils/iptables
@@ -82,8 +89,6 @@ sed -i \
 	-e 's?../../lang?$(TOPDIR)/feeds/packages/lang?' \
 	package/feeds/kiddin9/*/Makefile
 
-rm -rf package/network/utils/xdp-tools package/feeds/packages/v4l2loopback
-
 (
 if [ -f sdk.tar.xz ]; then
 	sed -i 's,$(STAGING_DIR_HOST)/bin/upx,upx,' package/feeds/kiddin9/*/Makefile

devices/common/kernel_6.1.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+rm -rf target/linux package/kernel package/boot package/firmware/linux-firmware package/network/config/wifi-scripts config/Config-images.in
+
+mkdir new; cp -rf .git new/.git
+cd new
+git reset --hard origin/master
+
+cp -rf --parents target/linux package/kernel package/boot package/firmware/linux-firmware include/kernel-6.1 package/network/config/wifi-scripts config/Config-images.in ../
+cd -
+
+git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/hack-6.1
+
+curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch
+
+rm -rf target/linux/generic/hack-6.1/{410-block-fit-partition-parser.patch,724-net-phy-aquantia*,720-net-phy-add-aqr-phys.patch}
+
+mkdir package/kernel/mt76/patches
+curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch -o package/kernel/mt76/patches/0001-mt76-allow-VHT-rate-on-2.4GHz.patch
+
+rm -rf package/feeds/kiddin9/quectel_Gobinet
+
+cd feeds/packages
+rm -rf libs/xr_usb_serial_common net/coova-chilli net/xtables-addons
+git_clone_path master https://github.com/openwrt/packages libs/xr_usb_serial_common
+git_clone_path master https://github.com/openwrt/packages net/coova-chilli
+git_clone_path master https://github.com/openwrt/packages net/xtables-addons
+cd -
+
+sed -i 's/=bbr/=cubic/' package/kernel/linux/files/sysctl-tcp-bbr.conf
+
+sed -i "s/tty\(0\|1\)::askfirst/tty\1::respawn/g" target/linux/*/base-files/etc/inittab
+
+sed -i "s/no-lto,/no-lto no-mold,/" include/package.mk
+
+echo "
+CONFIG_TESTING_KERNEL=y
+
+" >> devices/common/.config

devices/common/patches/usb-audio.patch

@@ -0,0 +1,10 @@
+--- a/package/kernel/linux/modules/usb.mk
++++ b/package/kernel/linux/modules/usb.mk
+@@ -576,6 +576,7 @@ define KernelPackage/usb-audio
+ 	CONFIG_SND_USB_AUDIO
+   $(call AddDepends/usb)
+   $(call AddDepends/sound)
++  DEPENDS += +LINUX_6_1:kmod-media-core
+   FILES:= \
+ 	$(LINUX_DIR)/sound/usb/snd-usbmidi-lib.ko \
+ 	$(LINUX_DIR)/sound/usb/snd-usb-audio.ko

devices/ipq50xx_arm/diy.sh

@@ -6,4 +6,4 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
 sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2099-12-06/" package/network/config/netifd/Makefile
 
-rm -rf feeds/kiddin9/{rtl8821cu,rtl88x2bu} package/kernel/mt76 devices/common/patches/mt7922.patch
+rm -rf package/kernel/mt76 devices/common/patches/mt7922.patch

devices/mediatek_filogic/diy.sh

@@ -1,16 +1,12 @@
 #!/bin/bash
 
 shopt -s extglob
+SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/hack-6.1
+bash $SHELL_FOLDER/../common/kernel_6.1.sh
 
 sed -i "s/mi-router-wr30u-stock/mi-router-wr30u/" package/boot/uboot-envtools/files/mediatek_filogic
 sed -i "s/mi-router-wr30u-stock/mi-router-wr30u/" target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
 sed -i "s/mi-router-wr30u-stock/mi-router-wr30u/" target/linux/mediatek/filogic/base-files/etc/board.d/02_network
 sed -i "s/mi-router-wr30u-stock/mi-router-wr30u/" target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
 
-rm -rf package/feeds/kiddin9/quectel_Gobinet devices/common/patches/kernel_version.patch devices/common/patches/rootfstargz.patch target/linux/generic/hack-6.1/{410-block-fit-partition-parser.patch,724-net-phy-aquantia*,720-net-phy-add-aqr-phys.patch}
-
-curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch
-
-rm -rf package/feeds/packages/libpfring

devices/mediatek_filogic/patches/kernel_version.patch

@@ -1,30 +0,0 @@
---- a/scripts/json_overview_image_info.py
-+++ b/scripts/json_overview_image_info.py
-@@ -47,7 +47,7 @@ def get_initial_output(image_info):
- 
- 
- if output:
--    default_packages, output["arch_packages"] = run(
-+    default_packages, output["arch_packages"], output["kernel_version"] = run(
-         [
-             "make",
-             "--no-print-directory",
-@@ -55,6 +55,7 @@ def get_initial_output(image_info):
-             "target/linux/",
-             "val.DEFAULT_PACKAGES",
-             "val.ARCH_PACKAGES",
-+            "val.LINUX_VERSION",
-             "V=s",
-         ],
-         stdout=PIPE,
-
---- a/scripts/json_add_image_info.py
-+++ b/scripts/json_add_image_info.py
-@@ -55,6 +55,7 @@ def get_titles():
-     "profiles": {
-         device_id: {
-             "image_prefix": getenv("DEVICE_IMG_PREFIX"),
-+            "image_initramfs": getenv("KERNEL_INITRAMFS_IMAGE"),
-             "images": [
-                 {
-                     "type": getenv("FILE_TYPE"),

devices/mediatek_filogic/settings.ini

@@ -1,2 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="main"

devices/meson_meson8b/diy.sh

@@ -4,13 +4,8 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/hack-6.1
+bash $SHELL_FOLDER/../common/kernel_6.1.sh
 
 git_clone_path master https://github.com/coolsnowwolf/lede target/linux/meson
 
-rm -rf package/feeds/kiddin9/quectel_Gobinet devices/common/patches/kernel_version.patch devices/common/patches/rootfstargz.patch  target/linux/generic/hack-6.1/410-block-fit-partition-parser.patch
-
-curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch
-
-
 

devices/meson_meson8b/patches/kernel_version.patch

@@ -1,30 +0,0 @@
---- a/scripts/json_overview_image_info.py
-+++ b/scripts/json_overview_image_info.py
-@@ -47,7 +47,7 @@ def get_initial_output(image_info):
- 
- 
- if output:
--    default_packages, output["arch_packages"] = run(
-+    default_packages, output["arch_packages"], output["kernel_version"] = run(
-         [
-             "make",
-             "--no-print-directory",
-@@ -55,6 +55,7 @@ def get_initial_output(image_info):
-             "target/linux/",
-             "val.DEFAULT_PACKAGES",
-             "val.ARCH_PACKAGES",
-+            "val.LINUX_VERSION",
-             "V=s",
-         ],
-         stdout=PIPE,
-
---- a/scripts/json_add_image_info.py
-+++ b/scripts/json_add_image_info.py
-@@ -55,6 +55,7 @@ def get_titles():
-     "profiles": {
-         device_id: {
-             "image_prefix": getenv("DEVICE_IMG_PREFIX"),
-+            "image_initramfs": getenv("KERNEL_INITRAMFS_IMAGE"),
-             "images": [
-                 {
-                     "type": getenv("FILE_TYPE"),

devices/meson_meson8b/patches/rootfstargz.patch

@@ -1,81 +0,0 @@
---- a/include/image.mk
-+++ b/include/image.mk
-@@ -300,6 +300,44 @@ ifdef CONFIG_TARGET_ROOTFS_TARGZ
-   endef
- endif
- 
-+define Device/Build/targz
-+  $$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
-+	  $(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json, \
-+	  $(BIN_DIR)/$$(ROOTFSTZ))
-+
-+  $(call Device/Export,$(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json,$(1))
-+
-+  $(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json: $(BIN_DIR)/$$(ROOTFSTZ)
-+	@mkdir -p $$(shell dirname $$@)
-+	DEVICE_ID="$(1)" \
-+	SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
-+	FILE_NAME="$$(notdir $$^)" \
-+	FILE_DIR="$(BIN_DIR)" \
-+	FILE_TYPE="rootfs" \
-+	FILE_FILESYSTEM="rootfs" \
-+	DEVICE_IMG_PREFIX="$$(DEVICE_IMG_PREFIX)" \
-+	DEVICE_VENDOR="$$(DEVICE_VENDOR)" \
-+	DEVICE_MODEL="$$(DEVICE_MODEL)" \
-+	DEVICE_VARIANT="$$(DEVICE_VARIANT)" \
-+	DEVICE_ALT0_VENDOR="$$(DEVICE_ALT0_VENDOR)" \
-+	DEVICE_ALT0_MODEL="$$(DEVICE_ALT0_MODEL)" \
-+	DEVICE_ALT0_VARIANT="$$(DEVICE_ALT0_VARIANT)" \
-+	DEVICE_ALT1_VENDOR="$$(DEVICE_ALT1_VENDOR)" \
-+	DEVICE_ALT1_MODEL="$$(DEVICE_ALT1_MODEL)" \
-+	DEVICE_ALT1_VARIANT="$$(DEVICE_ALT1_VARIANT)" \
-+	DEVICE_ALT2_VENDOR="$$(DEVICE_ALT2_VENDOR)" \
-+	DEVICE_ALT2_MODEL="$$(DEVICE_ALT2_MODEL)" \
-+	DEVICE_ALT2_VARIANT="$$(DEVICE_ALT2_VARIANT)" \
-+	DEVICE_TITLE="$$(DEVICE_TITLE)" \
-+	DEVICE_PACKAGES="$$(DEVICE_PACKAGES)" \
-+	TARGET="$(BOARD)" \
-+	SUBTARGET="$(if $(SUBTARGET),$(SUBTARGET),generic)" \
-+	VERSION_NUMBER="$(VERSION_NUMBER)" \
-+	VERSION_CODE="$(VERSION_CODE)" \
-+	SUPPORTED_DEVICES="$$(SUPPORTED_DEVICES)" \
-+	$(TOPDIR)/scripts/json_add_image_info.py $$@
-+endef
-+
- ifdef CONFIG_TARGET_ROOTFS_CPIOGZ
-   define Image/Build/cpiogz
- 	( cd $(TARGET_DIR); find . | $(STAGING_DIR_HOST)/bin/cpio -o -H newc -R 0:0 | gzip -9n >$(BIN_DIR)/$(IMG_ROOTFS).cpio.gz )
-@@ -367,6 +405,7 @@ define Device/Init
-   DEVICE_IMG_PREFIX := $(IMG_PREFIX)-$(1)
-   DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(1)-$$(2)
-   IMAGE_SIZE :=
-   NAND_SIZE :=
-+  ROOTFSTZ = $$(DEVICE_IMG_PREFIX)-rootfs.tar.gz
-   KERNEL_PREFIX = $$(DEVICE_IMG_PREFIX)
-   KERNEL_SUFFIX := -kernel.bin
-@@ -568,7 +607,7 @@ define Device/Build/kernel
- endef
- 
- define Device/Build/image
--  GZ_SUFFIX := $(if $(filter %dtb %gz,$(2)),,$(if $(and $(findstring ext4,$(1)),$(CONFIG_TARGET_IMAGES_GZIP)),.gz))
-+  GZ_SUFFIX := $(if $(filter %dtb %gz,$(2)),,$(if $(and $(findstring ext4,$(1)),$(findstring img,$(2)),$(CONFIG_TARGET_IMAGES_GZIP)),.gz))
-   $$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
- 	  $(BUILD_DIR)/json_info_files/$(call DEVICE_IMG_NAME,$(1),$(2)).json, \
- 	  $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX))
-@@ -606,6 +645,7 @@ define Device/Build/image
- 	FILE_TYPE=$(word 1,$(subst ., ,$(2))) \
- 	FILE_FILESYSTEM="$(1)" \
- 	DEVICE_IMG_PREFIX="$(DEVICE_IMG_PREFIX)" \
-+	KERNEL_INITRAMFS_IMAGE="$(subst $(IMG_PREFIX_EXTRA),,$(KERNEL_INITRAMFS_IMAGE))" \
- 	DEVICE_VENDOR="$(DEVICE_VENDOR)" \
- 	DEVICE_MODEL="$(DEVICE_MODEL)" \
- 	DEVICE_VARIANT="$(DEVICE_VARIANT)" \
-@@ -678,6 +718,8 @@ define Device/Build
-   $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Device/Build/initramfs,$(1)))
-   $(call Device/Build/kernel,$(1))
- 
-+  $(if $(CONFIG_TARGET_ROOTFS_TARGZ),$(call Device/Build/targz,$(PROFILE_SANITIZED)))
-+
-   $$(eval $$(foreach compile,$$(COMPILE), \
-     $$(call Device/Build/compile,$$(compile),$(1))))
- 

devices/meson_meson8b/settings.ini

@@ -1,2 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="main"

devices/qualcommax_ipq60xx/diy.sh

@@ -4,7 +4,7 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/hack-6.1
+bash $SHELL_FOLDER/../common/kernel_6.1.sh
 
 rm -rf target/linux/qualcommax/!(Makefile) package/kernel/qca-* package/boot/uboot-envtools package/firmware/ipq-wifi
 git_clone_path master https://github.com/coolsnowwolf/lede target/linux/qualcommax
@@ -12,9 +12,6 @@ git_clone_path master https://github.com/coolsnowwolf/lede package/qca
 git_clone_path master https://github.com/coolsnowwolf/lede package/boot/uboot-envtools
 git_clone_path master https://github.com/coolsnowwolf/lede package/firmware/ipq-wifi
 
-rm -rf package/feeds/kiddin9/quectel_Gobinet devices/common/patches/kernel_version.patch devices/common/patches/rootfstargz.patch target/linux/generic/hack-6.1/{410-block-fit-partition-parser.patch,724-net-phy-aquantia*,720-net-phy-add-aqr-phys.patch}
-
-curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch
 
 
 

devices/qualcommax_ipq60xx/patches/kernel_version.patch

@@ -1,30 +0,0 @@
---- a/scripts/json_overview_image_info.py
-+++ b/scripts/json_overview_image_info.py
-@@ -47,7 +47,7 @@ def get_initial_output(image_info):
- 
- 
- if output:
--    default_packages, output["arch_packages"] = run(
-+    default_packages, output["arch_packages"], output["kernel_version"] = run(
-         [
-             "make",
-             "--no-print-directory",
-@@ -55,6 +55,7 @@ def get_initial_output(image_info):
-             "target/linux/",
-             "val.DEFAULT_PACKAGES",
-             "val.ARCH_PACKAGES",
-+            "val.LINUX_VERSION",
-             "V=s",
-         ],
-         stdout=PIPE,
-
---- a/scripts/json_add_image_info.py
-+++ b/scripts/json_add_image_info.py
-@@ -55,6 +55,7 @@ def get_titles():
-     "profiles": {
-         device_id: {
-             "image_prefix": getenv("DEVICE_IMG_PREFIX"),
-+            "image_initramfs": getenv("KERNEL_INITRAMFS_IMAGE"),
-             "images": [
-                 {
-                     "type": getenv("FILE_TYPE"),

devices/qualcommax_ipq60xx/settings.ini

@@ -1,2 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="main"

devices/qualcommax_ipq807x/diy.sh

@@ -3,8 +3,4 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/hack-6.1
-
-rm -rf package/feeds/kiddin9/quectel_Gobinet devices/common/patches/kernel_version.patch devices/common/patches/rootfstargz.patch target/linux/generic/hack-6.1/{410-block-fit-partition-parser.patch,724-net-phy-aquantia*,720-net-phy-add-aqr-phys.patch}
-
-curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch
+bash $SHELL_FOLDER/../common/kernel_6.1.sh

devices/qualcommax_ipq807x/patches/kernel_version.patch

@@ -1,30 +0,0 @@
---- a/scripts/json_overview_image_info.py
-+++ b/scripts/json_overview_image_info.py
-@@ -47,7 +47,7 @@ def get_initial_output(image_info):
- 
- 
- if output:
--    default_packages, output["arch_packages"] = run(
-+    default_packages, output["arch_packages"], output["kernel_version"] = run(
-         [
-             "make",
-             "--no-print-directory",
-@@ -55,6 +55,7 @@ def get_initial_output(image_info):
-             "target/linux/",
-             "val.DEFAULT_PACKAGES",
-             "val.ARCH_PACKAGES",
-+            "val.LINUX_VERSION",
-             "V=s",
-         ],
-         stdout=PIPE,
-
---- a/scripts/json_add_image_info.py
-+++ b/scripts/json_add_image_info.py
-@@ -55,6 +55,7 @@ def get_titles():
-     "profiles": {
-         device_id: {
-             "image_prefix": getenv("DEVICE_IMG_PREFIX"),
-+            "image_initramfs": getenv("KERNEL_INITRAMFS_IMAGE"),
-             "images": [
-                 {
-                     "type": getenv("FILE_TYPE"),

devices/qualcommax_ipq807x/settings.ini

@@ -1,2 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="main"

devices/rockchip_armv8/.config

@@ -17,7 +17,6 @@ CONFIG_KERNEL_DEBUG_INFO_BTF=y
 # CONFIG_KERNEL_DEBUG_INFO_REDUCED is not set
 CONFIG_KERNEL_XDP_SOCKETS=y
 
-CONFIG_PACKAGE_kmod-rtl88x2bu=m
 CONFIG_PACKAGE_kmod-pcie_mhi=m
 
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务

devices/rockchip_armv8/diy.sh

@@ -3,6 +3,8 @@
 shopt -s extglob
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
+bash $SHELL_FOLDER/../common/kernel_6.1.sh
+
 rm -rf package/boot
 
 git_clone_path master https://github.com/immortalwrt/immortalwrt package/boot
@@ -14,9 +16,7 @@ git_clone_path master https://github.com/immortalwrt/immortalwrt target/linux/ro
 
 git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/hack-6.1
 
-curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch
-
-rm -rf package/feeds/kiddin9/{quectel_Gobinet} package/feeds/packages/libpfring devices/common/patches/kernel_version.patch devices/common/patches/rootfstargz.patch target/linux/generic/hack-6.1/{410-block-fit-partition-parser.patch,724-net-phy-aquantia*,720-net-phy-add-aqr-phys.patch}
+rm -rf target/linux/generic/hack-6.1/{410-block-fit-partition-parser.patch,724-net-phy-aquantia*,720-net-phy-add-aqr-phys.patch}
 
 curl -sfL https://raw.githubusercontent.com/immortalwrt/immortalwrt/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
 

devices/rockchip_armv8/patches/kernel_version.patch

@@ -1,30 +0,0 @@
---- a/scripts/json_overview_image_info.py
-+++ b/scripts/json_overview_image_info.py
-@@ -47,7 +47,7 @@ def get_initial_output(image_info):
- 
- 
- if output:
--    default_packages, output["arch_packages"] = run(
-+    default_packages, output["arch_packages"], output["kernel_version"] = run(
-         [
-             "make",
-             "--no-print-directory",
-@@ -55,6 +55,7 @@ def get_initial_output(image_info):
-             "target/linux/",
-             "val.DEFAULT_PACKAGES",
-             "val.ARCH_PACKAGES",
-+            "val.LINUX_VERSION",
-             "V=s",
-         ],
-         stdout=PIPE,
-
---- a/scripts/json_add_image_info.py
-+++ b/scripts/json_add_image_info.py
-@@ -55,6 +55,7 @@ def get_titles():
-     "profiles": {
-         device_id: {
-             "image_prefix": getenv("DEVICE_IMG_PREFIX"),
-+            "image_initramfs": getenv("KERNEL_INITRAMFS_IMAGE"),
-             "images": [
-                 {
-                     "type": getenv("FILE_TYPE"),

devices/rockchip_armv8/patches/rootfstargz.patch

@@ -1,81 +0,0 @@
---- a/include/image.mk
-+++ b/include/image.mk
-@@ -300,6 +300,44 @@ ifdef CONFIG_TARGET_ROOTFS_TARGZ
-   endef
- endif
- 
-+define Device/Build/targz
-+  $$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
-+	  $(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json, \
-+	  $(BIN_DIR)/$$(ROOTFSTZ))
-+
-+  $(call Device/Export,$(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json,$(1))
-+
-+  $(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json: $(BIN_DIR)/$$(ROOTFSTZ)
-+	@mkdir -p $$(shell dirname $$@)
-+	DEVICE_ID="$(1)" \
-+	SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
-+	FILE_NAME="$$(notdir $$^)" \
-+	FILE_DIR="$(BIN_DIR)" \
-+	FILE_TYPE="rootfs" \
-+	FILE_FILESYSTEM="rootfs" \
-+	DEVICE_IMG_PREFIX="$$(DEVICE_IMG_PREFIX)" \
-+	DEVICE_VENDOR="$$(DEVICE_VENDOR)" \
-+	DEVICE_MODEL="$$(DEVICE_MODEL)" \
-+	DEVICE_VARIANT="$$(DEVICE_VARIANT)" \
-+	DEVICE_ALT0_VENDOR="$$(DEVICE_ALT0_VENDOR)" \
-+	DEVICE_ALT0_MODEL="$$(DEVICE_ALT0_MODEL)" \
-+	DEVICE_ALT0_VARIANT="$$(DEVICE_ALT0_VARIANT)" \
-+	DEVICE_ALT1_VENDOR="$$(DEVICE_ALT1_VENDOR)" \
-+	DEVICE_ALT1_MODEL="$$(DEVICE_ALT1_MODEL)" \
-+	DEVICE_ALT1_VARIANT="$$(DEVICE_ALT1_VARIANT)" \
-+	DEVICE_ALT2_VENDOR="$$(DEVICE_ALT2_VENDOR)" \
-+	DEVICE_ALT2_MODEL="$$(DEVICE_ALT2_MODEL)" \
-+	DEVICE_ALT2_VARIANT="$$(DEVICE_ALT2_VARIANT)" \
-+	DEVICE_TITLE="$$(DEVICE_TITLE)" \
-+	DEVICE_PACKAGES="$$(DEVICE_PACKAGES)" \
-+	TARGET="$(BOARD)" \
-+	SUBTARGET="$(if $(SUBTARGET),$(SUBTARGET),generic)" \
-+	VERSION_NUMBER="$(VERSION_NUMBER)" \
-+	VERSION_CODE="$(VERSION_CODE)" \
-+	SUPPORTED_DEVICES="$$(SUPPORTED_DEVICES)" \
-+	$(TOPDIR)/scripts/json_add_image_info.py $$@
-+endef
-+
- ifdef CONFIG_TARGET_ROOTFS_CPIOGZ
-   define Image/Build/cpiogz
- 	( cd $(TARGET_DIR); find . | $(STAGING_DIR_HOST)/bin/cpio -o -H newc -R 0:0 | gzip -9n >$(BIN_DIR)/$(IMG_ROOTFS).cpio.gz )
-@@ -367,6 +405,7 @@ define Device/Init
-   DEVICE_IMG_PREFIX := $(IMG_PREFIX)-$(1)
-   DEVICE_IMG_NAME = $$(DEVICE_IMG_PREFIX)-$$(1)-$$(2)
-   IMAGE_SIZE :=
-   NAND_SIZE :=
-+  ROOTFSTZ = $$(DEVICE_IMG_PREFIX)-rootfs.tar.gz
-   KERNEL_PREFIX = $$(DEVICE_IMG_PREFIX)
-   KERNEL_SUFFIX := -kernel.bin
-@@ -568,7 +607,7 @@ define Device/Build/kernel
- endef
- 
- define Device/Build/image
--  GZ_SUFFIX := $(if $(filter %dtb %gz,$(2)),,$(if $(and $(findstring ext4,$(1)),$(CONFIG_TARGET_IMAGES_GZIP)),.gz))
-+  GZ_SUFFIX := $(if $(filter %dtb %gz,$(2)),,$(if $(and $(findstring ext4,$(1)),$(findstring img,$(2)),$(CONFIG_TARGET_IMAGES_GZIP)),.gz))
-   $$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
- 	  $(BUILD_DIR)/json_info_files/$(call DEVICE_IMG_NAME,$(1),$(2)).json, \
- 	  $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX))
-@@ -606,6 +645,7 @@ define Device/Build/image
- 	FILE_TYPE=$(word 1,$(subst ., ,$(2))) \
- 	FILE_FILESYSTEM="$(1)" \
- 	DEVICE_IMG_PREFIX="$(DEVICE_IMG_PREFIX)" \
-+	KERNEL_INITRAMFS_IMAGE="$(subst $(IMG_PREFIX_EXTRA),,$(KERNEL_INITRAMFS_IMAGE))" \
- 	DEVICE_VENDOR="$(DEVICE_VENDOR)" \
- 	DEVICE_MODEL="$(DEVICE_MODEL)" \
- 	DEVICE_VARIANT="$(DEVICE_VARIANT)" \
-@@ -678,6 +718,8 @@ define Device/Build
-   $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Device/Build/initramfs,$(1)))
-   $(call Device/Build/kernel,$(1))
- 
-+  $(if $(CONFIG_TARGET_ROOTFS_TARGZ),$(call Device/Build/targz,$(PROFILE_SANITIZED)))
-+
-   $$(eval $$(foreach compile,$$(COMPILE), \
-     $$(call Device/Build/compile,$$(compile),$(1))))
- 

devices/rockchip_armv8/settings.ini

@@ -1,2 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="main"

devices/sunxi_cortexa53/.config

@@ -12,8 +12,6 @@ CONFIG_TARGET_DEVICE_sunxi_cortexa53_DEVICE_xunlong_orangepi-zero2=y
 CONFIG_TARGET_DEVICE_sunxi_cortexa53_DEVICE_xunlong_orangepi-zero3=y
 
 CONFIG_PACKAGE_kmod-rtl8189es=y
-CONFIG_PACKAGE_kmod-rtl8821cu=m
-CONFIG_PACKAGE_kmod-rtl88x2bu=m
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 

devices/sunxi_cortexa53/diy.sh

@@ -4,11 +4,7 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/hack-6.1
-
-rm -rf package/feeds/kiddin9/quectel_Gobinet package/feeds/packages/libpfring devices/common/patches/kernel_version.patch devices/common/patches/rootfstargz.patch target/linux/generic/hack-6.1/{410-block-fit-partition-parser.patch,724-net-phy-aquantia*,720-net-phy-add-aqr-phys.patch}
-
-curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch
+bash $SHELL_FOLDER/../common/kernel_6.1.sh
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-rtl8189es/' target/linux/sunxi/Makefile
 

devices/sunxi_cortexa53/patches/kernel_version.patch

@@ -1,30 +0,0 @@
---- a/scripts/json_overview_image_info.py
-+++ b/scripts/json_overview_image_info.py
-@@ -47,7 +47,7 @@ def get_initial_output(image_info):
- 
- 
- if output:
--    default_packages, output["arch_packages"] = run(
-+    default_packages, output["arch_packages"], output["kernel_version"] = run(
-         [
-             "make",
-             "--no-print-directory",
-@@ -55,6 +55,7 @@ def get_initial_output(image_info):
-             "target/linux/",
-             "val.DEFAULT_PACKAGES",
-             "val.ARCH_PACKAGES",
-+            "val.LINUX_VERSION",
-             "V=s",
-         ],
-         stdout=PIPE,
-
---- a/scripts/json_add_image_info.py
-+++ b/scripts/json_add_image_info.py
-@@ -55,6 +55,7 @@ def get_titles():
-     "profiles": {
-         device_id: {
-             "image_prefix": getenv("DEVICE_IMG_PREFIX"),
-+            "image_initramfs": getenv("KERNEL_INITRAMFS_IMAGE"),
-             "images": [
-                 {
-                     "type": getenv("FILE_TYPE"),

devices/sunxi_cortexa53/patches/rootfstargz.patch

@@ -1,92 +0,0 @@
-From 467ef0219a65a3dd63ce27f41e54f09bf1f2ad64 Mon Sep 17 00:00:00 2001
-From: kiddin9 <[email protected]>
-Date: Mon, 4 Mar 2024 08:01:42 +0800
-Subject: [PATCH] Update image.mk
-
-Signed-off-by: kiddin9 <[email protected]>
----
- include/image.mk | 43 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 43 insertions(+)
-
-diff --git a/include/image.mk b/include/image.mk
-index 4b6acbe1aad6a..f307dea1ca9a3 100644
---- a/include/image.mk
-+++ b/include/image.mk
-@@ -313,6 +313,44 @@ ifdef CONFIG_TARGET_ROOTFS_TARGZ
-   endef
- endif
- 
-+define Device/Build/targz
-+  $$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
-+	  $(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json, \
-+	  $(BIN_DIR)/$$(ROOTFSTZ))
-+
-+  $(call Device/Export,$(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json,$(1))
-+
-+  $(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json: $(BIN_DIR)/$$(ROOTFSTZ)
-+	@mkdir -p $$(shell dirname $$@)
-+	DEVICE_ID="$(1)" \
-+	SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
-+	FILE_NAME="$$(notdir $$^)" \
-+	FILE_DIR="$(BIN_DIR)" \
-+	FILE_TYPE="rootfs" \
-+	FILE_FILESYSTEM="rootfs" \
-+	DEVICE_IMG_PREFIX="$$(DEVICE_IMG_PREFIX)" \
-+	DEVICE_VENDOR="$$(DEVICE_VENDOR)" \
-+	DEVICE_MODEL="$$(DEVICE_MODEL)" \
-+	DEVICE_VARIANT="$$(DEVICE_VARIANT)" \
-+	DEVICE_ALT0_VENDOR="$$(DEVICE_ALT0_VENDOR)" \
-+	DEVICE_ALT0_MODEL="$$(DEVICE_ALT0_MODEL)" \
-+	DEVICE_ALT0_VARIANT="$$(DEVICE_ALT0_VARIANT)" \
-+	DEVICE_ALT1_VENDOR="$$(DEVICE_ALT1_VENDOR)" \
-+	DEVICE_ALT1_MODEL="$$(DEVICE_ALT1_MODEL)" \
-+	DEVICE_ALT1_VARIANT="$$(DEVICE_ALT1_VARIANT)" \
-+	DEVICE_ALT2_VENDOR="$$(DEVICE_ALT2_VENDOR)" \
-+	DEVICE_ALT2_MODEL="$$(DEVICE_ALT2_MODEL)" \
-+	DEVICE_ALT2_VARIANT="$$(DEVICE_ALT2_VARIANT)" \
-+	DEVICE_TITLE="$$(DEVICE_TITLE)" \
-+	DEVICE_PACKAGES="$$(DEVICE_PACKAGES)" \
-+	TARGET="$(BOARD)" \
-+	SUBTARGET="$(if $(SUBTARGET),$(SUBTARGET),generic)" \
-+	VERSION_NUMBER="$(VERSION_NUMBER)" \
-+	VERSION_CODE="$(VERSION_CODE)" \
-+	SUPPORTED_DEVICES="$$(SUPPORTED_DEVICES)" \
-+	$(TOPDIR)/scripts/json_add_image_info.py $$@
-+endef
-+
- ifdef CONFIG_TARGET_ROOTFS_CPIOGZ
-   define Image/Build/cpiogz
- 	( cd $(TARGET_DIR); find . | $(STAGING_DIR_HOST)/bin/cpio -o -H newc -R 0:0 | gzip -9n >$(BIN_DIR)/$(IMG_ROOTFS).cpio.gz )
-@@ -394,6 +432,7 @@ define Device/Init
-   FACTORY_IMG_NAME :=
-   IMAGE_SIZE :=
-   NAND_SIZE :=
-+  ROOTFSTZ = $$(DEVICE_IMG_PREFIX)-rootfs.tar.gz
-   KERNEL_PREFIX = $$(DEVICE_IMG_PREFIX)
-   KERNEL_SUFFIX := -kernel.bin
-   KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX)
-@@ -631,6 +670,7 @@ endef
- 
- define Device/Build/image
-   GZ_SUFFIX := $(if $(filter %dtb %gz,$(2)),,$(if $(and $(findstring ext4,$(1)),$(CONFIG_TARGET_IMAGES_GZIP)),.gz))
-+  GZ_SUFFIX := $(if $(filter %dtb %gz,$(2)),,$(if $(and $(findstring ext4,$(1)),$(findstring img,$(2)),$(CONFIG_TARGET_IMAGES_GZIP)),.gz))
-   $$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
- 	  $(BUILD_DIR)/json_info_files/$(call DEVICE_IMG_NAME,$(1),$(2)).json, \
- 	  $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX))
-@@ -667,6 +707,7 @@ define Device/Build/image
- 	FILE_DIR="$(KDIR)/tmp" \
- 	FILE_TYPE=$(word 1,$(subst ., ,$(2))) \
- 	FILE_FILESYSTEM="$(1)" \
-+	KERNEL_INITRAMFS_IMAGE="$(subst $(IMG_PREFIX_EXTRA),,$(KERNEL_INITRAMFS_IMAGE))" \
- 	DEVICE_IMG_PREFIX="$(DEVICE_IMG_PREFIX)" \
- 	DEVICE_VENDOR="$(DEVICE_VENDOR)" \
- 	DEVICE_MODEL="$(DEVICE_MODEL)" \
-@@ -758,6 +799,8 @@ define Device/Build
-   $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Device/Build/initramfs,$(1)))
-   $(call Device/Build/kernel,$(1))
- 
-+  $(if $(CONFIG_TARGET_ROOTFS_TARGZ),$(call Device/Build/targz,$(PROFILE_SANITIZED)))
-+
-   $$(eval $$(foreach compile,$$(COMPILE), \
-     $$(call Device/Build/compile,$$(compile),$(1))))
- 

devices/sunxi_cortexa53/settings.ini

@@ -1,2 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="main"

devices/sunxi_cortexa7/.config

@@ -21,8 +21,6 @@ CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_sinovoip_bananapi-m2-ultra=y
 CONFIG_TARGET_DEVICE_sunxi_cortexa7_DEVICE_mele_m9=y
 
 CONFIG_PACKAGE_kmod-rtl8189es=y
-CONFIG_PACKAGE_kmod-rtl8821cu=m
-CONFIG_PACKAGE_kmod-rtl88x2bu=m
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 

devices/sunxi_cortexa7/diy.sh

@@ -4,11 +4,7 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/hack-6.1
-
-rm -rf package/feeds/kiddin9/quectel_Gobinet devices/common/patches/kernel_version.patch devices/common/patches/rootfstargz.patch target/linux/generic/hack-6.1/{410-block-fit-partition-parser.patch,724-net-phy-aquantia*,720-net-phy-add-aqr-phys.patch}
-
-curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch
+bash $SHELL_FOLDER/../common/kernel_6.1.sh
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152 kmod-rtl8189es/' target/linux/sunxi/Makefile
 

devices/sunxi_cortexa7/patches/kernel_version.patch

@@ -1,30 +0,0 @@
---- a/scripts/json_overview_image_info.py
-+++ b/scripts/json_overview_image_info.py
-@@ -47,7 +47,7 @@ def get_initial_output(image_info):
- 
- 
- if output:
--    default_packages, output["arch_packages"] = run(
-+    default_packages, output["arch_packages"], output["kernel_version"] = run(
-         [
-             "make",
-             "--no-print-directory",
-@@ -55,6 +55,7 @@ def get_initial_output(image_info):
-             "target/linux/",
-             "val.DEFAULT_PACKAGES",
-             "val.ARCH_PACKAGES",
-+            "val.LINUX_VERSION",
-             "V=s",
-         ],
-         stdout=PIPE,
-
---- a/scripts/json_add_image_info.py
-+++ b/scripts/json_add_image_info.py
-@@ -55,6 +55,7 @@ def get_titles():
-     "profiles": {
-         device_id: {
-             "image_prefix": getenv("DEVICE_IMG_PREFIX"),
-+            "image_initramfs": getenv("KERNEL_INITRAMFS_IMAGE"),
-             "images": [
-                 {
-                     "type": getenv("FILE_TYPE"),

devices/sunxi_cortexa7/patches/rootfstargz.patch

@@ -1,92 +0,0 @@
-From 467ef0219a65a3dd63ce27f41e54f09bf1f2ad64 Mon Sep 17 00:00:00 2001
-From: kiddin9 <[email protected]>
-Date: Mon, 4 Mar 2024 08:01:42 +0800
-Subject: [PATCH] Update image.mk
-
-Signed-off-by: kiddin9 <[email protected]>
----
- include/image.mk | 43 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 43 insertions(+)
-
-diff --git a/include/image.mk b/include/image.mk
-index 4b6acbe1aad6a..f307dea1ca9a3 100644
---- a/include/image.mk
-+++ b/include/image.mk
-@@ -313,6 +313,44 @@ ifdef CONFIG_TARGET_ROOTFS_TARGZ
-   endef
- endif
- 
-+define Device/Build/targz
-+  $$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
-+	  $(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json, \
-+	  $(BIN_DIR)/$$(ROOTFSTZ))
-+
-+  $(call Device/Export,$(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json,$(1))
-+
-+  $(BUILD_DIR)/json_info_files/$$(ROOTFSTZ).json: $(BIN_DIR)/$$(ROOTFSTZ)
-+	@mkdir -p $$(shell dirname $$@)
-+	DEVICE_ID="$(1)" \
-+	SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) \
-+	FILE_NAME="$$(notdir $$^)" \
-+	FILE_DIR="$(BIN_DIR)" \
-+	FILE_TYPE="rootfs" \
-+	FILE_FILESYSTEM="rootfs" \
-+	DEVICE_IMG_PREFIX="$$(DEVICE_IMG_PREFIX)" \
-+	DEVICE_VENDOR="$$(DEVICE_VENDOR)" \
-+	DEVICE_MODEL="$$(DEVICE_MODEL)" \
-+	DEVICE_VARIANT="$$(DEVICE_VARIANT)" \
-+	DEVICE_ALT0_VENDOR="$$(DEVICE_ALT0_VENDOR)" \
-+	DEVICE_ALT0_MODEL="$$(DEVICE_ALT0_MODEL)" \
-+	DEVICE_ALT0_VARIANT="$$(DEVICE_ALT0_VARIANT)" \
-+	DEVICE_ALT1_VENDOR="$$(DEVICE_ALT1_VENDOR)" \
-+	DEVICE_ALT1_MODEL="$$(DEVICE_ALT1_MODEL)" \
-+	DEVICE_ALT1_VARIANT="$$(DEVICE_ALT1_VARIANT)" \
-+	DEVICE_ALT2_VENDOR="$$(DEVICE_ALT2_VENDOR)" \
-+	DEVICE_ALT2_MODEL="$$(DEVICE_ALT2_MODEL)" \
-+	DEVICE_ALT2_VARIANT="$$(DEVICE_ALT2_VARIANT)" \
-+	DEVICE_TITLE="$$(DEVICE_TITLE)" \
-+	DEVICE_PACKAGES="$$(DEVICE_PACKAGES)" \
-+	TARGET="$(BOARD)" \
-+	SUBTARGET="$(if $(SUBTARGET),$(SUBTARGET),generic)" \
-+	VERSION_NUMBER="$(VERSION_NUMBER)" \
-+	VERSION_CODE="$(VERSION_CODE)" \
-+	SUPPORTED_DEVICES="$$(SUPPORTED_DEVICES)" \
-+	$(TOPDIR)/scripts/json_add_image_info.py $$@
-+endef
-+
- ifdef CONFIG_TARGET_ROOTFS_CPIOGZ
-   define Image/Build/cpiogz
- 	( cd $(TARGET_DIR); find . | $(STAGING_DIR_HOST)/bin/cpio -o -H newc -R 0:0 | gzip -9n >$(BIN_DIR)/$(IMG_ROOTFS).cpio.gz )
-@@ -394,6 +432,7 @@ define Device/Init
-   FACTORY_IMG_NAME :=
-   IMAGE_SIZE :=
-   NAND_SIZE :=
-+  ROOTFSTZ = $$(DEVICE_IMG_PREFIX)-rootfs.tar.gz
-   KERNEL_PREFIX = $$(DEVICE_IMG_PREFIX)
-   KERNEL_SUFFIX := -kernel.bin
-   KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX)
-@@ -631,6 +670,7 @@ endef
- 
- define Device/Build/image
-   GZ_SUFFIX := $(if $(filter %dtb %gz,$(2)),,$(if $(and $(findstring ext4,$(1)),$(CONFIG_TARGET_IMAGES_GZIP)),.gz))
-+  GZ_SUFFIX := $(if $(filter %dtb %gz,$(2)),,$(if $(and $(findstring ext4,$(1)),$(findstring img,$(2)),$(CONFIG_TARGET_IMAGES_GZIP)),.gz))
-   $$(_TARGET): $(if $(CONFIG_JSON_OVERVIEW_IMAGE_INFO), \
- 	  $(BUILD_DIR)/json_info_files/$(call DEVICE_IMG_NAME,$(1),$(2)).json, \
- 	  $(BIN_DIR)/$(call DEVICE_IMG_NAME,$(1),$(2))$$(GZ_SUFFIX))
-@@ -667,6 +707,7 @@ define Device/Build/image
- 	FILE_DIR="$(KDIR)/tmp" \
- 	FILE_TYPE=$(word 1,$(subst ., ,$(2))) \
- 	FILE_FILESYSTEM="$(1)" \
-+	KERNEL_INITRAMFS_IMAGE="$(subst $(IMG_PREFIX_EXTRA),,$(KERNEL_INITRAMFS_IMAGE))" \
- 	DEVICE_IMG_PREFIX="$(DEVICE_IMG_PREFIX)" \
- 	DEVICE_VENDOR="$(DEVICE_VENDOR)" \
- 	DEVICE_MODEL="$(DEVICE_MODEL)" \
-@@ -758,6 +799,8 @@ define Device/Build
-   $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Device/Build/initramfs,$(1)))
-   $(call Device/Build/kernel,$(1))
- 
-+  $(if $(CONFIG_TARGET_ROOTFS_TARGZ),$(call Device/Build/targz,$(PROFILE_SANITIZED)))
-+
-   $$(eval $$(foreach compile,$$(COMPILE), \
-     $$(call Device/Build/compile,$$(compile),$(1))))
- 

devices/sunxi_cortexa7/settings.ini

@@ -1,2 +0,0 @@
-REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH="main"

devices/x86_64/.config

@@ -23,9 +23,6 @@ CONFIG_KERNEL_XDP_SOCKETS=y
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 
-CONFIG_PACKAGE_kmod-rtl8821cu=m
-CONFIG_PACKAGE_kmod-rtl88x2bu=m
-
 CONFIG_PACKAGE_kmod-pcie_mhi=m
 
 CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=n

devices/x86_64/diy.sh

@@ -2,15 +2,18 @@
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
+bash $SHELL_FOLDER/../common/kernel_6.1.sh
+
 git_clone_path master https://github.com/coolsnowwolf/lede target/linux/x86/files
 
-git_clone_path master https://github.com/coolsnowwolf/lede target/linux/x86/patches-5.15
+git_clone_path master https://github.com/coolsnowwolf/lede target/linux/x86/patches-6.1
 
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/x86/base-files/etc/board.d/02_network -o target/linux/x86/base-files/etc/board.d/02_network
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += kmod-usb-hid kmod-mmc kmod-sdhci usbutils pciutils lm-sensors-detect kmod-alx kmod-vmxnet3 kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-r8125 kmod-8139cp kmod-8139too kmod-i40e kmod-drm-i915 kmod-drm-amdgpu kmod-mlx4-core kmod-mlx5-core fdisk lsblk kmod-phy-broadcom/' target/linux/x86/Makefile
+curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/x86/64/config-6.1 -o target/linux/x86/64/config-6.1
 
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += kmod-usb-hid kmod-mmc kmod-sdhci usbutils pciutils lm-sensors-detect kmod-alx kmod-vmxnet3 kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-r8125 kmod-8139cp kmod-8139too kmod-i40e kmod-drm-i915 kmod-drm-amdgpu kmod-mlx4-core kmod-mlx5-core fdisk lsblk kmod-phy-broadcom/' target/linux/x86/Makefile
 
 mv -f tmp/r81* feeds/kiddin9/
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk
@@ -29,7 +32,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_DRM_I915=y
-' >> ./target/linux/x86/config-5.15
+' >> ./target/linux/x86/config-6.1
 
 sed -i "s/enabled '0'/enabled '1'/g" feeds/packages/utils/irqbalance/files/irqbalance.config
 

devices/x86_64/patches/Intel_gpu.patch

@@ -1,8 +1,8 @@
 diff --git a/package/firmware/linux-firmware/intel.mk b/package/firmware/linux-firmware/intel.mk
-index 923701c703d..7f60014ea6c 100644
+index 0719e2b28c386..9f8ac874fe24b 100644
 --- a/package/firmware/linux-firmware/intel.mk
 +++ b/package/firmware/linux-firmware/intel.mk
-@@ -176,3 +176,95 @@ define Package/e100-firmware/install
+@@ -208,3 +208,108 @@ define Package/e100-firmware/install
  	$(INSTALL_DATA) $(PKG_BUILD_DIR)/e100/d102e_ucode.bin $(1)/lib/firmware/e100/
  endef
  $(eval $(call BuildPackage,e100-firmware))
@@ -14,7 +14,12 @@ index 923701c703d..7f60014ea6c 100644
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_dmc_ver2_09.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_dmc_ver2_10.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_dmc_ver2_12.bin $(1)/lib/firmware/i915/
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_dmc_ver2_14.bin $(1)/lib/firmware/i915/
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_dmc_ver2_16.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_guc_62.0.3.bin $(1)/lib/firmware/i915/
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_guc_69.0.3.bin $(1)/lib/firmware/i915/
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_guc_70.1.1.bin $(1)/lib/firmware/i915/
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_guc_70.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adls_dmc_ver2_01.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_dmc_ver1_07.bin $(1)/lib/firmware/i915/
 +	ln -s /lib/firmware/i915/bxt_dmc_ver1_07.bin $(1)/lib/firmware/i915/bxt_dmc_ver1.bin
@@ -41,12 +46,15 @@ index 923701c703d..7f60014ea6c 100644
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_guc_33.0.4.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_guc_49.0.1.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_guc_62.0.0.bin $(1)/lib/firmware/i915/
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_guc_69.0.3.bin $(1)/lib/firmware/i915/
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_guc_70.1.1.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_huc_9.0.0.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_dmc_ver1_04.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_guc_32.0.3.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_guc_33.0.0.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_guc_49.0.1.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_guc_62.0.0.bin $(1)/lib/firmware/i915/
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_guc_70.1.1.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_huc_4.0.0.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_huc_ver03_01_2893.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_dmc_ver1_07.bin $(1)/lib/firmware/i915/
@@ -64,6 +72,7 @@ index 923701c703d..7f60014ea6c 100644
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_33.0.0.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_49.0.1.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_62.0.0.bin $(1)/lib/firmware/i915/
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_70.1.1.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_ver9_14.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_ver9_39.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_huc_4.0.0.bin $(1)/lib/firmware/i915/
@@ -92,6 +101,10 @@ index 923701c703d..7f60014ea6c 100644
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_guc_35.2.0.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_guc_49.0.1.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_guc_62.0.0.bin $(1)/lib/firmware/i915/
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_guc_69.0.3.bin $(1)/lib/firmware/i915/
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_guc_70.1.1.bin $(1)/lib/firmware/i915/
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_guc_70.bin $(1)/lib/firmware/i915/
++	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_huc.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_huc_7.0.12.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_huc_7.0.3.bin $(1)/lib/firmware/i915/
 +	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_huc_7.5.0.bin $(1)/lib/firmware/i915/
@@ -154,45 +167,3 @@ index 5ed0d5dbbf2..a853a8c7980 100644
  define KernelPackage/irqbypass
    SUBMENU:=Virtualization
    TITLE:=IRQ offload/bypass manager
-
---- a/target/linux/x86/64/config-5.15
-+++ b/target/linux/x86/64/config-5.15
-@@ -117,30 +117,12 @@ CONFIG_DRM_FBDEV_EMULATION=y
- CONFIG_DRM_FBDEV_OVERALLOC=100
- CONFIG_DRM_GEM_SHMEM_HELPER=y
- # CONFIG_DRM_HYPERV is not set
--CONFIG_DRM_I915=y
--CONFIG_DRM_I915_CAPTURE_ERROR=y
--CONFIG_DRM_I915_COMPRESS_ERROR=y
--# CONFIG_DRM_I915_DEBUG is not set
--# CONFIG_DRM_I915_DEBUG_GUC is not set
--# CONFIG_DRM_I915_DEBUG_MMIO is not set
--# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
--# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
--CONFIG_DRM_I915_FENCE_TIMEOUT=10000
- CONFIG_DRM_I915_FORCE_PROBE=""
--CONFIG_DRM_I915_GVT=y
- CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
--# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
--CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
- CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
- CONFIG_DRM_I915_REQUEST_TIMEOUT=20000
--# CONFIG_DRM_I915_SELFTEST is not set
- CONFIG_DRM_I915_STOP_TIMEOUT=100
--# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
--# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
- CONFIG_DRM_I915_TIMESLICE_DURATION=1
--CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
--CONFIG_DRM_I915_USERPTR=y
--# CONFIG_DRM_I915_WERROR is not set
- CONFIG_DRM_KMS_HELPER=y
- CONFIG_DRM_MIPI_DSI=y
- CONFIG_DRM_PANEL=y
-@@ -178,6 +160,7 @@ CONFIG_FB_CMDLINE=y
- CONFIG_FB_DEFERRED_IO=y
- CONFIG_FB_EFI=y
- CONFIG_FB_HYPERV=y
-+# CONFIG_FB_INTEL is not set
- CONFIG_FB_MODE_HELPERS=y
- CONFIG_FB_SIMPLE=y
- CONFIG_FB_SYS_COPYAREA=y

devices/x86_generic/.config

@@ -23,8 +23,5 @@ CONFIG_KERNEL_XDP_SOCKETS=y
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
 
-CONFIG_PACKAGE_kmod-rtl8821cu=m
-CONFIG_PACKAGE_kmod-rtl88x2bu=m
-
 CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=n
 

devices/x86_generic/diy.sh

@@ -2,9 +2,11 @@
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
+bash $SHELL_FOLDER/../common/kernel_6.1.sh
+
 git_clone_path master https://github.com/coolsnowwolf/lede target/linux/x86/files
 
-git_clone_path master https://github.com/coolsnowwolf/lede target/linux/x86/patches-5.15
+git_clone_path master https://github.com/coolsnowwolf/lede target/linux/x86/patches-6.1
 
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
 
@@ -27,7 +29,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PCI=y
 CONFIG_DRM_I915=y
-' >> ./target/linux/x86/config-5.15
+' >> ./target/linux/x86/config-6.1
 
 sed -i "s/DEVICE_MODEL := x86/DEVICE_MODEL := x86\/32/" target/linux/x86/image/generic.mk
 

devices/x86_generic/patches/Intel_gpu.patch

@@ -1,198 +0,0 @@
-diff --git a/package/firmware/linux-firmware/intel.mk b/package/firmware/linux-firmware/intel.mk
-index 923701c703d..7f60014ea6c 100644
---- a/package/firmware/linux-firmware/intel.mk
-+++ b/package/firmware/linux-firmware/intel.mk
-@@ -176,3 +176,95 @@ define Package/e100-firmware/install
- 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/e100/d102e_ucode.bin $(1)/lib/firmware/e100/
- endef
- $(eval $(call BuildPackage,e100-firmware))
-+
-+Package/i915-firmware = $(call Package/firmware-default,Intel GPU firmware)
-+define Package/i915-firmware/install
-+	$(INSTALL_DIR) $(1)/lib/firmware/i915
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_dmc_ver1_09.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_dmc_ver2_09.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_dmc_ver2_10.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_dmc_ver2_12.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adlp_guc_62.0.3.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/adls_dmc_ver2_01.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_dmc_ver1_07.bin $(1)/lib/firmware/i915/
-+	ln -s /lib/firmware/i915/bxt_dmc_ver1_07.bin $(1)/lib/firmware/i915/bxt_dmc_ver1.bin
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_guc_32.0.3.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_guc_33.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_guc_49.0.1.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_guc_62.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_guc_ver8_7.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_guc_ver9_29.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_huc_2.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_huc_ver01_07_1398.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/bxt_huc_ver01_8_2893.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/cml_guc_33.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/cml_guc_49.0.1.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/cml_guc_62.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/cml_huc_4.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/cnl_dmc_ver1_06.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/cnl_dmc_ver1_07.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/dg1_dmc_ver2_02.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/dg1_guc_49.0.1.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/dg1_guc_62.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/dg1_huc_7.7.1.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/dg1_huc_7.9.3.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_guc_33.0.4.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_guc_49.0.1.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_guc_62.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/ehl_huc_9.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_dmc_ver1_04.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_guc_32.0.3.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_guc_33.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_guc_49.0.1.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_guc_62.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_huc_4.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/glk_huc_ver03_01_2893.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_dmc_ver1_07.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_dmc_ver1_09.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_guc_32.0.3.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_guc_33.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_guc_49.0.1.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_guc_62.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_huc_9.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/icl_huc_ver8_4_3238.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_dmc_ver1_01.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_dmc_ver1_04.bin $(1)/lib/firmware/i915/
-+	ln -s /lib/firmware/i915/kbl_dmc_ver1_04.bin $(1)/lib/firmware/i915/kbl_dmc_ver1.bin
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_32.0.3.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_33.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_49.0.1.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_62.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_ver9_14.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_guc_ver9_39.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_huc_4.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/kbl_huc_ver02_00_1810.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/rkl_dmc_ver2_02.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/rkl_dmc_ver2_03.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_dmc_ver1_23.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_dmc_ver1_26.bin $(1)/lib/firmware/i915/
-+	ln -s /lib/firmware/i915/skl_dmc_ver1_26.bin $(1)/lib/firmware/i915/skl_dmc_ver1.bin
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_dmc_ver1_27.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_32.0.3.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_33.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_49.0.1.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_62.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_ver1.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_ver4.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_ver6_1.bin $(1)/lib/firmware/i915/
-+	ln -s /lib/firmware/i915/skl_guc_ver6_1.bin $(1)/lib/firmware/i915/skl_guc_ver6.bin
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_guc_ver9_33.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_huc_2.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/skl_huc_ver01_07_1398.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_dmc_ver2_04.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_dmc_ver2_06.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_dmc_ver2_08.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_dmc_ver2_12.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_guc_35.2.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_guc_49.0.1.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_guc_62.0.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_huc_7.0.12.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_huc_7.0.3.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_huc_7.5.0.bin $(1)/lib/firmware/i915/
-+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/i915/tgl_huc_7.9.3.bin $(1)/lib/firmware/i915/
-+endef
-+$(eval $(call BuildPackage,i915-firmware))
-
-diff --git a/package/kernel/linux/modules/virt.mk b/package/kernel/linux/modules/virt.mk
-index 5ed0d5dbbf2..a853a8c7980 100644
---- a/package/kernel/linux/modules/virt.mk
-+++ b/package/kernel/linux/modules/virt.mk
-@@ -4,6 +4,50 @@
- # This is free software, licensed under the GNU General Public License v2.
- # See /LICENSE for more information.
- #
-+define KernelPackage/vfio-mdev
-+  SUBMENU:=Virtualization
-+  TITLE:=VFIO driver support to to virtualize devices
-+  DEPENDS:=@TARGET_x86_64
-+  KCONFIG:=	\
-+	CONFIG_IOMMU_API=y \
-+	CONFIG_MMU=y \
-+	CONFIG_VFIO=y \
-+	CONFIG_VFIO_MDEV \
-+	CONFIG_VFIO_MDEV_DEVICE \
-+	CONFIG_VFIO_NOIOMMU=y \
-+	CONFIG_VFIO_PCI=y \
-+	CONFIG_VFIO_PCI_IGD=y
-+  FILES:= \
-+	$(LINUX_DIR)/drivers/vfio/mdev/mdev.ko \
-+	$(LINUX_DIR)/drivers/vfio/mdev/[email protected]
-+  AUTOLOAD:=$(call AutoProbe,mdev vfio_mdev)
-+endef
-+
-+define KernelPackage/vfio-mdev/description
-+  Provides a framework to virtualize devices.
-+endef
-+
-+$(eval $(call KernelPackage,vfio-mdev))
-+
-+define KernelPackage/i915-gvt
-+  SUBMENU:=Virtualization
-+  TITLE:=Enable KVM/VFIO support for Intel GVT-g
-+  DEPENDS:=@TARGET_x86_64 +kmod-kvm-intel +kmod-drm-i915 +kmod-vfio-mdev
-+  KCONFIG:= CONFIG_DRM_I915_GVT_KVMGT
-+  FILES:= \
-+      $(LINUX_DIR)/drivers/gpu/drm/i915/gvt/[email protected] \
-+      $(LINUX_DIR)/drivers/gpu/drm/i915/[email protected]
-+  AUTOLOAD:=$(call AutoProbe,kvmgt)
-+endef
-+
-+define KernelPackage/i915-gvt/description
-+  Enable Intel GVT-g graphics virtualization technology host support with 
-+  integrated graphics. With GVT-g, it's possible to have one integrated 
-+  graphics device shared by multiple VMs under KVM.
-+endef
-+
-+$(eval $(call KernelPackage,i915-gvt))
-+
- define KernelPackage/irqbypass
-   SUBMENU:=Virtualization
-   TITLE:=IRQ offload/bypass manager
-
---- a/target/linux/x86/64/config-5.15
-+++ b/target/linux/x86/64/config-5.15
-@@ -117,30 +117,12 @@ CONFIG_DRM_FBDEV_EMULATION=y
- CONFIG_DRM_FBDEV_OVERALLOC=100
- CONFIG_DRM_GEM_SHMEM_HELPER=y
- # CONFIG_DRM_HYPERV is not set
--CONFIG_DRM_I915=y
--CONFIG_DRM_I915_CAPTURE_ERROR=y
--CONFIG_DRM_I915_COMPRESS_ERROR=y
--# CONFIG_DRM_I915_DEBUG is not set
--# CONFIG_DRM_I915_DEBUG_GUC is not set
--# CONFIG_DRM_I915_DEBUG_MMIO is not set
--# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
--# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
--CONFIG_DRM_I915_FENCE_TIMEOUT=10000
- CONFIG_DRM_I915_FORCE_PROBE=""
--CONFIG_DRM_I915_GVT=y
- CONFIG_DRM_I915_HEARTBEAT_INTERVAL=2500
--# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
--CONFIG_DRM_I915_MAX_REQUEST_BUSYWAIT=8000
- CONFIG_DRM_I915_PREEMPT_TIMEOUT=640
- CONFIG_DRM_I915_REQUEST_TIMEOUT=20000
--# CONFIG_DRM_I915_SELFTEST is not set
- CONFIG_DRM_I915_STOP_TIMEOUT=100
--# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
--# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
- CONFIG_DRM_I915_TIMESLICE_DURATION=1
--CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
--CONFIG_DRM_I915_USERPTR=y
--# CONFIG_DRM_I915_WERROR is not set
- CONFIG_DRM_KMS_HELPER=y
- CONFIG_DRM_MIPI_DSI=y
- CONFIG_DRM_PANEL=y
-@@ -178,6 +160,7 @@ CONFIG_FB_CMDLINE=y
- CONFIG_FB_DEFERRED_IO=y
- CONFIG_FB_EFI=y
- CONFIG_FB_HYPERV=y
-+# CONFIG_FB_INTEL is not set
- CONFIG_FB_MODE_HELPERS=y
- CONFIG_FB_SIMPLE=y
- CONFIG_FB_SYS_COPYAREA=y