update

.github/workflows/Openwrt-AutoBuild.yml

@@ -97,6 +97,7 @@ jobs:
         fi
 
     - name: Trigger Packages Update
+      continue-on-error: true
       run: |
         gitdate=$(curl -s "https://api.github.com/repos/kiddin9/openwrt-packages/actions/runs" | jq -r '.workflow_runs[0].created_at')
         gitdate=$(date -d "$gitdate" +%s)
@@ -146,7 +147,16 @@ jobs:
         fi
         fi
         ln -sf /workdir/openwrt $GITHUB_WORKSPACE/openwrt
-        
+
+    - name: Free up disk space
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      run: |
+        sudo mkdir -p -m 777 /mnt/openwrt/dl /mnt/openwrt/bin /mnt/openwrt/staging_dir
+        ln -sf /mnt/openwrt/dl openwrt/dl
+        ln -sf /mnt/openwrt/bin openwrt/bin
+        ln -sf /mnt/openwrt/staging_dir openwrt/staging_dir
+
     - name: Load custom configuration
       run: |
         cp -rf devices/common/. openwrt/
@@ -209,21 +219,22 @@ jobs:
         clean: ${{ contains(github.event.action, 'nocache') }}
         prefix: ${{ github.workspace }}/openwrt
     
+    - name: Check space usage
+      run: |
+        shopt -s extglob
+        rm -rf openwrt/staging_dir/!(*${{ env.MTARGET }}*|host|hostpkg) openwrt/build_dir/!(*${{ env.MTARGET }}*|host|hostpkg)
+        df -hT
+    
     - name: Compile the firmware
       id: compile
       run: |
         shopt -s extglob
         cd openwrt
-        rm -rf staging_dir/!(*${{ env.MTARGET }}*|host)
-        df -hT
         echo -e "$(($(nproc)+1)) thread compile"
         make -j$(($(nproc)+1)) || make -j1 V=s || (curl -k --data chat_id="${{ env.TELEGRAM_CHAT_ID }}" --data "text=❌ OpenWrt ${{ env.VERSION }} ${{matrix.target}} 编译失败 😂" "https://api.telegram.org/bot${{ env.TELEGRAM_TOKEN }}/sendMessage";exit 1)
         sed -i "s/# CONFIG_IB is not set/CONFIG_IB=y/" .config
         rm -rf staging_dir/toolchain-*/bin/*openwrt-linux-musl-lto-dump
         rm -rf staging_dir/toolchain-*/initial
-   
-    - name: Check space usage
-      run: df -hT
 
     - name: Organize files
       id: organize

devices/armvirt_64/diy/target/linux/armvirt/image/Makefile

@@ -95,15 +95,6 @@ define Device/odroid-n2
 endef
 TARGET_DEVICES += odroid-n2
 
-define Device/fastrhino_r68s
-  DEVICE_VENDOR := 电犀牛
-  DEVICE_MODEL := R68S
-  SOC := rk3568
-  DEVICE_PACKAGES := 
-endef
-TARGET_DEVICES += fastrhino_r68s
-
-
 define Image/Build
 	export IMG_PREFIX="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))"; \
 	export BIN_DIR=$(BIN_DIR); \

devices/common/diy.sh

@@ -24,7 +24,7 @@ sed -i "s/^.*vermagic$/\techo '1' > \$(LINUX_DIR)\/.vermagic/" include/kernel-de
 ./scripts/feeds install -a
 cd feeds/kiddin9; git pull; cd -
 
-mv -f feeds/kiddin9/{r81*,igb-intel,rtl8189es} tmp/
+mv -f feeds/kiddin9/{r81*,igb-intel} tmp/
 
 sed -i "s/192.168.1/10.0.0/" package/feeds/kiddin9/base-files/files/bin/config_generate
 

devices/common/kernel_5.15.sh

@@ -20,7 +20,6 @@ svn export --force https://github.com/openwrt/packages/trunk/kernel feeds/packag
 svn export --force  https://github.com/openwrt/packages/trunk/net/xtables-addons feeds/packages/net/xtables-addons
 
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15
-curl -sfL https://raw.githubusercontent.com/openwrt/openwrt/openwrt-22.03/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
 
 sed -i "s/tty\(0\|1\)::askfirst/tty\1::respawn/g" target/linux/*/base-files/etc/inittab
 

devices/common/patches/download.patch

@@ -1,13 +1,13 @@
---- a/scripts/download.pl
-+++ b/scripts/download.pl
-@@ -80,8 +80,8 @@ ($)
- 	}
- 
- 	return $have_curl
--		? (qw(curl -f --connect-timeout 20 --retry 5 --location --insecure), shellwords($ENV{CURL_OPTIONS} || ''), $url)
--		: (qw(wget --tries=5 --timeout=20 --no-check-certificate --output-document=-), shellwords($ENV{WGET_OPTIONS} || ''), $url)
-+		? (qw(curl -f --connect-timeout 5 -m 30 --retry 3 --location --insecure), shellwords($ENV{CURL_OPTIONS} || ''), $url)
-+		: (qw(wget --tries=3 --timeout=20 --no-check-certificate --output-document=-), shellwords($ENV{WGET_OPTIONS} || ''), $url)
- 	;
- }
+--- a/scripts/download.pl
++++ b/scripts/download.pl
+@@ -80,8 +80,8 @@ ($)
+ 	}
+ 
+ 	return $have_curl
+-		? (qw(curl -f --connect-timeout 20 --retry 5 --location --insecure), shellwords($ENV{CURL_OPTIONS} || ''), $url)
+-		: (qw(wget --tries=5 --timeout=20 --no-check-certificate --output-document=-), shellwords($ENV{WGET_OPTIONS} || ''), $url)
++		? (qw(curl -f --connect-timeout 5 -m 30 --retry 3 --location --insecure), shellwords($ENV{CURL_OPTIONS} || ''), $url)
++		: (qw(wget --tries=3 --timeout=20 --no-check-certificate --output-document=-), shellwords($ENV{WGET_OPTIONS} || ''), $url)
+ 	;
+ }
  

devices/common/patches/targets.patch

@@ -11,7 +11,7 @@
 +	dnsmasq-full \
 +	firewall \
 +	kmod-ipt-nat \
-+	kmod-ipt-na6 \
++	kmod-ipt-nat6 \
  	odhcp6c \
  	odhcpd-ipv6only \
  	ppp \

devices/ipq40xx_generic/diy.sh

@@ -4,6 +4,5 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts -o target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts
 
 

devices/ipq40xx_generic/patches/cm520.patch

@@ -0,0 +1,90 @@
+--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts
++++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-cm520-79f.dts
+@@ -9,6 +9,10 @@
+ 	model = "MobiPromo CM520-79F";
+ 	compatible = "mobipromo,cm520-79f";
+ 
++	chosen {
++		bootargs-append = " ubi.block=0,1 root=/dev/ubiblock0_1";
++	};
++
+ 	aliases {
+ 		led-boot = &led_sys;
+ 		led-failsafe = &led_sys;
+@@ -218,65 +222,8 @@
+ 			#size-cells = <1>;
+ 
+ 			partition@0 {
+-				label = "SBL1";
+-				reg = <0x0 0x100000>;
+-				read-only;
+-			};
+-
+-			partition@100000 {
+-				label = "MIBIB";
+-				reg = <0x100000 0x100000>;
+-				read-only;
+-			};
+-
+-			partition@200000 {
+-				label = "BOOTCONFIG";
+-				reg = <0x200000 0x100000>;
+-			};
+-
+-			partition@300000 {
+-				label = "QSEE";
+-				reg = <0x300000 0x100000>;
+-				read-only;
+-			};
+-
+-			partition@400000 {
+-				label = "QSEE_1";
+-				reg = <0x400000 0x100000>;
+-				read-only;
+-			};
+-
+-			partition@500000 {
+-				label = "CDT";
+-				reg = <0x500000 0x80000>;
+-				read-only;
+-			};
+-
+-			partition@580000 {
+-				label = "CDT_1";
+-				reg = <0x580000 0x80000>;
+-				read-only;
+-			};
+-
+-			partition@600000 {
+-				label = "BOOTCONFIG1";
+-				reg = <0x600000 0x80000>;
+-			};
+-
+-			partition@680000 {
+-				label = "APPSBLENV";
+-				reg = <0x680000 0x80000>;
+-			};
+-
+-			partition@700000 {
+-				label = "APPSBL";
+-				reg = <0x700000 0x200000>;
+-				read-only;
+-			};
+-
+-			partition@900000 {
+-				label = "APPSBL_1";
+-				reg = <0x900000 0x200000>;
++				label = "Bootloader";
++				reg = <0x0 0xb00000>;
+ 				read-only;
+ 			};
+ 
+@@ -306,7 +253,7 @@
+ 			};
+ 
+ 			partition@b80000 {
+-				label = "ubi";
++				label = "rootfs";
+ 				reg = <0xb80000 0x7480000>;
+ 			};
+ 		};

devices/ramips_mt7621/diy.sh

@@ -4,6 +4,3 @@ shopt -s extglob
 
 
 
-curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/ramips/dts/mt7621_xiaomi_mi-router-4a-3g-v2.dtsi -o target/linux/ramips/dts/mt7621_xiaomi_mi-router-4a-3g-v2.dtsi
-
-

devices/ramips_mt7621/patches/4a-breed-fix.patch

@@ -0,0 +1,47 @@
+--- a/target/linux/ramips/dts/mt7621_xiaomi_mi-router-4a-3g-v2.dtsi
++++ b/target/linux/ramips/dts/mt7621_xiaomi_mi-router-4a-3g-v2.dtsi
+@@ -69,40 +69,16 @@
+ 				read-only;
+ 			};
+ 
+-			partition@40000 {
+-				label = "Bdata";
+-				reg = <0x40000 0x10000>;
+-				read-only;
+-			};
+-
+-			factory: partition@50000 {
++			factory: partition@40000 {
+ 				label = "factory";
+-				reg = <0x50000 0x10000>;
+-				read-only;
+-			};
+-
+-			partition@60000 {
+-				label = "crash";
+-				reg = <0x60000 0x10000>;
+-				read-only;
+-			};
+-
+-			partition@70000 {
+-				label = "cfg_bak";
+-				reg = <0x70000 0x10000>;
+-				read-only;
+-			};
+-
+-			partition@80000 {
+-				label = "overlay";
+-				reg = <0x80000 0x100000>;
++				reg = <0x40000 0x10000>;
+ 				read-only;
+ 			};
+ 
+-			firmware: partition@180000 {
++			partition@50000 {
+ 				compatible = "denx,uimage";
+ 				label = "firmware";
+-				reg = <0x180000 0xe80000>;
++				reg = <0x50000 0xfb0000>;
+ 			};
+ 		};
+ 	};

devices/rockchip_armv8/.config

@@ -2,17 +2,8 @@
 CONFIG_TARGET_rockchip=y
 CONFIG_TARGET_rockchip_armv8=y
 CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2s=y
-CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4s=y
-CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4se=y
-CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2c=y
-CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-r5s=y
-CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_friendlyarm_nanopi-neo3=y
-CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_embedfire_doornet1=y
-CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_embedfire_doornet2=y
-CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_xunlong_orangepi-r1-plus=y
-CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_xunlong_orangepi-r1-plus-lts=y
-CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_radxa_rock-pi-4=y
+CONFIG_TARGET_ALL_PROFILES=y
+CONFIG_TARGET_DEVICE_rockchip_armv8_DEVICE_xunlong_orangepi-r1-plus-lts=n
 
 CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
 CONFIG_PACKAGE_luci-ssl-nginx=y # nginx

devices/rockchip_armv8/diy.sh

@@ -1,17 +1,21 @@
 #!/bin/bash
 
 shopt -s extglob
+SHELL_FOLDER=$(dirname $(readlink -f "$0"))
+bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
 rm -rf package/boot/uboot-rockchip
 svn export --force https://github.com/coolsnowwolf/lede/trunk/package/boot/uboot-rockchip package/boot/uboot-rockchip
 svn export --force https://github.com/coolsnowwolf/lede/trunk/package/boot/arm-trusted-firmware-rockchip-vendor package/boot/arm-trusted-firmware-rockchip-vendor
-rm -rf target/linux/rockchip/!(Makefile|patches-5.10)
+rm -rf target/linux/rockchip/!(Makefile|patches-5.15)
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/rockchip target/linux/rockchip
-rm -rf target/linux/rockchip/{.svn,patches-5.10/.svn}
-svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/rockchip/patches-5.10 target/linux/rockchip/patches-5.10
-rm -rf target/linux/rockchip/patches-5.10/{002-net-usb*,003-dt-bindings*,006-rockchip-rk3399*}
+rm -rf target/linux/rockchip/{.svn,patches-5.15/.svn}
+svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/rockchip/patches-5.15 target/linux/rockchip/patches-5.15
+rm -rf target/linux/rockchip/patches-5.15/{002-net-usb*,003-dt-bindings*,006-rockchip-rk3399*}
 svn export --force https://github.com/friendlyarm/friendlywrt/trunk/target/linux/rockchip/armv8/base-files/etc/modules.d target/linux/rockchip/armv8/base-files/etc/modules.d
 
+curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
+
 mv -f tmp/r8125 feeds/kiddin9/
 
 sed -i -e 's,kmod-r8168,kmod-r8169,g' target/linux/rockchip/image/armv8.mk
@@ -20,4 +24,4 @@ sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-drm-rockchip
 
 echo '
 CONFIG_SENSORS_PWM_FAN=y
-' >> ./target/linux/rockchip/armv8/config-5.10
+' >> ./target/linux/rockchip/armv8/config-5.15

devices/rockchip_armv8/patches/fix.patch

@@ -0,0 +1,58 @@
+--- a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
++++ b/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
+@@ -17,7 +17,6 @@ xunlong,orangepi-r1-plus-lts)
+ 	ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth1"
+ 	;;
+ friendlyarm,nanopi-r4s|\
+-friendlyarm,nanopi-r4se|\
+ sharevdi,guangmiao-g4c)
+ 	ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
+ 	ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth1"
+@@ -25,10 +24,14 @@ sharevdi,guangmiao-g4c)
+ firefly,rk3568-roc-pc)
+ 	ucidef_set_led_timer "health" "health" "firefly:yellow:user" "200" "800"
+ 	;;
++friendlyarm,nanopi-r4se)
++	ucidef_set_led_netdev "wan" "WAN" "wan_led" "eth0"
++	ucidef_set_led_netdev "lan" "LAN" "lan_led" "eth1"
++	;;
+ friendlyarm,nanopi-r5s)
+-	ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
+-	ucidef_set_led_netdev "lan1" "LAN1" "green:lan1" "eth1"
+-	ucidef_set_led_netdev "lan2" "LAN2" "green:lan2" "eth2"
++	ucidef_set_led_netdev "wan" "WAN" "wan_led" "eth0" "link"
++	ucidef_set_led_netdev "lan1" "LAN1" "lan1_led" "eth1" "link"
++	ucidef_set_led_netdev "lan2" "LAN2" "lan2_led" "eth2" "link"
+ 	;;
+ hinlink,opc-h68k)
+ 	ucidef_set_led_netdev "wan" "WAN" "blue:net" "eth0"
+
+--- a/target/linux/rockchip/image/Makefile
++++ b/target/linux/rockchip/image/Makefile
+@@ -75,4 +75,26 @@ endef
+ 
+ include $(SUBTARGET).mk
+ 
++define Image/Build
++	if [ $(PROFILE_SANITIZED) == "friendlyarm_nanopi-r5s" ]; then \
++		export IMG_PREFIX="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))"; \
++		export BIN_DIR=$(BIN_DIR); \
++		export TOPDIR=$(TOPDIR); \
++		cd /www/wwwroot/op.supes.top/bcache/rockchip/armv8/r5s_packit; \
++		. ../modify_packit.sh; \
++		./build.sh sd-img; \
++		[ "$(MORE)" == "eflasher" ] && ./build.sh emmc-img; \
++		rm -rf $(BIN_DIR)/*r5s-squashfs-sysupgrade.img.gz $(BIN_DIR)/images-for-eflasher; \
++	elif [ $(PROFILE_SANITIZED) == "friendlyarm_nanopi-r4se" ]; then \
++		export IMG_PREFIX="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))"; \
++		export BIN_DIR=$(BIN_DIR); \
++		export TOPDIR=$(TOPDIR); \
++		cd /www/wwwroot/op.supes.top/bcache/rockchip/armv8/r4se_packit; \
++		. ../modify_packit.sh; \
++		./build.sh sd-img; \
++		[ "$(MORE)" == "eflasher" ] && ./build.sh emmc-img; \
++		rm -rf $(BIN_DIR)/*r4se-squashfs-sysupgrade.img.gz $(BIN_DIR)/images-for-eflasher; \
++	fi
++endef
++
+ $(eval $(call BuildImage))

devices/rockchip_armv8/patches/r5s.patch

@@ -1,95 +0,0 @@
---- a/target/linux/rockchip/image/armv8.mk
-+++ b/target/linux/rockchip/image/armv8.mk
-@@ -52,4 +52,13 @@
- TARGET_DEVICES += friendlyarm_nanopi-r2s
- 
-+define Device/friendlyarm_nanopi-r5s
-+  DEVICE_VENDOR := FriendlyARM
-+  DEVICE_MODEL := NanoPi R5S
-+  SOC := rk3328
-+  DEVICE_PACKAGES := kmod-r8125 luci-app-emmc-tools
-+  DEVICE_DTS = rockchip/rk3328-nanopi-r2s
-+endef
-+TARGET_DEVICES += friendlyarm_nanopi-r5s
-+
- define Device/friendlyarm_nanopi-r4s
-   DEVICE_VENDOR := FriendlyARM
-
---- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
-+++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
-@@ -18,6 +18,9 @@ rockchip_setup_interfaces()
- 	xunlong,orangepi-r1-plus-lts)
- 		ucidef_set_interfaces_lan_wan 'eth1' 'eth0'
- 		;;
-+	friendlyelec,nanopi-r5s)
-+		ucidef_set_interfaces_lan_wan 'eth1 eth2' 'eth0'
-+		;;
- 	*)
- 		ucidef_set_interface_lan 'eth0'
- 		;;
-@@ -60,6 +63,10 @@ rockchip_setup_macs()
- 		lan_mac=$(cat /sys/class/net/eth1/address)
- 		wan_mac=$(macaddr_add "$lan_mac" -1)
- 		;;
-+	friendlyelec,nanopi-r5s)
-+		wan_mac=$(nanopi_r2s_generate_mac mmcblk2)
-+		lan_mac=$(macaddr_add "$wan_mac" 1)
-+		;;
- 	esac
- 
- 	[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
-
---- a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
-+++ a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
-@@ -24,4 +24,9 @@
- 	ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth1"
- 	;;
-+friendlyelec,nanopi-r5s)
-+	ucidef_set_led_netdev "wan" "WAN" "wan_led" "eth0" "link"
-+	ucidef_set_led_netdev "lan1" "LAN1" "lan1_led" "eth1" "link"
-+	ucidef_set_led_netdev "lan2" "LAN2" "lan2_led" "eth2" "link"
-+	;;
- esac
- 
-
---- a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
-+++ a/target/linux/rockchip/armv8/base-files/etc/hotplug.d/net/40-net-smp-affinity
-@@ -43,4 +43,16 @@
- 	set_interface_core 20 "eth1"
- 	;;
-+friendlyelec,nanopi-r5s)
-+	set_interface_core 8 "eth0"
-+	echo f > /sys/class/net/eth0/queues/rx-0/rps_cpus
-+	set_interface_core 4 "eth1-0"
-+	set_interface_core 4 "eth1-16"
-+	set_interface_core 4 "eth1-18"
-+	echo b > /sys/class/net/eth1/queues/rx-0/rps_cpus
-+	set_interface_core 2 "eth2-0"
-+	set_interface_core 2 "eth2-16"
-+	set_interface_core 2 "eth2-18"
-+	echo d > /sys/class/net/eth2/queues/rx-0/rps_cpus
-+	;;
- esac
-
---- a/target/linux/rockchip/image/Makefile
-+++ b/target/linux/rockchip/image/Makefile
-@@ -75,4 +75,17 @@ endef
- 
- include $(SUBTARGET).mk
- 
-+define Image/Build
-+	if [ $(PROFILE_SANITIZED) == "friendlyarm_nanopi-r5s" ]; then \
-+		export IMG_PREFIX="$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED))"; \
-+		export BIN_DIR=$(BIN_DIR); \
-+		export TOPDIR=$(TOPDIR); \
-+		cd /www/wwwroot/op.supes.top/bcache/rockchip/armv8/r5s_packit; \
-+		. ../modify_packit.sh; \
-+		./build.sh sd-img; \
-+		[ "$(MORE)" == "eflasher" ] && ./build.sh emmc-img; \
-+		rm -rf $(BIN_DIR)/*r5s-squashfs-sysupgrade.img.gz $(BIN_DIR)/images-for-eflasher; \
-+	fi
-+endef
-+
- $(eval $(call BuildImage))
- 
-

devices/rockchip_armv8/patches/video.patch

@@ -1,99 +0,0 @@
-From d990f23c514708418a2222cfd20dcc3478f9a522 Mon Sep 17 00:00:00 2001
-From: kiddin9 <[email protected]>
-Date: Mon, 23 May 2022 14:55:01 +0800
-Subject: [PATCH] Update video.mk
-
----
- package/kernel/linux/modules/video.mk | 63 +++++++++++++++++++++++++--
- 1 file changed, 59 insertions(+), 4 deletions(-)
-
-diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk
-index 2a306b5f4289..0a759dd0ebcd 100644
---- a/package/kernel/linux/modules/video.mk
-+++ b/package/kernel/linux/modules/video.mk
-@@ -220,13 +220,35 @@ endef
- 
- $(eval $(call KernelPackage,fb-tft-ili9486))
- 
-+define KernelPackage/multimedia-input
-+  SUBMENU:=$(VIDEO_MENU)
-+  TITLE:=Multimedia input support
-+  DEPENDS:=+kmod-input-core
-+  KCONFIG:=CONFIG_RC_CORE \
-+	CONFIG_LIRC=y \
-+	CONFIG_RC_DECODERS=y \
-+	CONFIG_RC_DEVICES=y
-+  FILES:=$(LINUX_DIR)/drivers/media/rc/rc-core.ko
-+  AUTOLOAD:=$(call AutoProbe,rc-core)
-+endef
-+
-+define KernelPackage/multimedia-input/description
-+  Enable multimedia input.
-+endef
-+
-+$(eval $(call KernelPackage,multimedia-input))
- 
- define KernelPackage/drm
-   SUBMENU:=$(VIDEO_MENU)
-   TITLE:=Direct Rendering Manager (DRM) support
-   HIDDEN:=1
--  DEPENDS:=+kmod-dma-buf +kmod-i2c-core +PACKAGE_kmod-backlight:kmod-backlight
--  KCONFIG:=CONFIG_DRM
-+ DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit +PACKAGE_kmod-backlight:kmod-backlight
-+  KCONFIG:=	\
-+	CONFIG_DRM	\
-+	CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y	\
-+	CONFIG_DRM_FBDEV_EMULATION=y \
-+	CONFIG_DRM_FBDEV_OVERALLOC=100 \
-+	CONFIG_HDMI
-   FILES:= \
- 	$(LINUX_DIR)/drivers/gpu/drm/drm.ko \
- 	$(LINUX_DIR)/drivers/gpu/drm/drm_panel_orientation_quirks.ko
-@@ -300,8 +322,6 @@ define KernelPackage/drm-imx
-   TITLE:=Freescale i.MX DRM support
-   DEPENDS:=@TARGET_imx +kmod-drm-kms-helper
-   KCONFIG:=CONFIG_DRM_IMX \
--	CONFIG_DRM_FBDEV_EMULATION=y \
--	CONFIG_DRM_FBDEV_OVERALLOC=100 \
- 	CONFIG_IMX_IPUV3_CORE \
- 	CONFIG_RESET_CONTROLLER=y \
- 	CONFIG_DRM_IMX_IPUV3 \
-@@ -1028,3 +1048,38 @@ define KernelPackage/video-gspca-konica/description
- endef
- 
- $(eval $(call KernelPackage,video-gspca-konica))
-+
-+define KernelPackage/drm-i915
-+  SUBMENU:=$(VIDEO_MENU)
-+  TITLE:=Intel GPU drm support
-+  DEPENDS:=@TARGET_x86 +kmod-drm-ttm +kmod-drm-kms-helper +i915-firmware
-+  KCONFIG:=	\
-+          CONFIG_INTEL_GTT=y			\
-+          CONFIG_DRM_I915=m			\
-+          CONFIG_DRM_I915_CAPTURE_ERROR=y	\
-+          CONFIG_DRM_I915_COMPRESS_ERROR=y	\
-+          CONFIG_DRM_I915_USERPTR=y		\
-+          CONFIG_DRM_I915_GVT=y			\
-+          CONFIG_DRM_I915_WERROR=n		\
-+          CONFIG_DRM_I915_DEBUG=n		\
-+          CONFIG_DRM_I915_DEBUG_MMIO=n		\
-+          CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS=n	\
-+          CONFIG_DRM_I915_SW_FENCE_CHECK_DAG=n	\
-+          CONFIG_DRM_I915_DEBUG_GUC=n		\
-+          CONFIG_DRM_I915_SELFTEST=n		\
-+          CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS=n	\
-+          CONFIG_DRM_I915_DEBUG_VBLANK_EVADE=n	\
-+          CONFIG_DRM_I915_DEBUG_RUNTIME_PM=n
-+  FILES:=$(LINUX_DIR)/drivers/gpu/drm/i915/i915.ko
-+  AUTOLOAD:=$(call AutoProbe,i915)
-+endef
-+
-+define KernelPackage/drm-i915/description
-+  Direct Rendering Manager (DRM) support for "Intel Graphics
-+  Media Accelerator" or "HD Graphics" integrated graphics,
-+  including 830M, 845G, 852GM, 855GM, 865G, 915G, 945G, 965G,
-+  G35, G41, G43, G45 chipsets and Celeron, Pentium, Core i3,
-+  Core i5, Core i7 as well as Atom CPUs with integrated graphics.
-+endef
-+
-+$(eval $(call KernelPackage,drm-i915))

devices/sunxi_cortexa53/diy.sh

@@ -5,6 +5,6 @@ shopt -s extglob
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 bash $SHELL_FOLDER/../common/kernel_5.15.sh
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' target/linux/sunxi/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk/' target/linux/sunxi/Makefile
 
 

devices/sunxi_cortexa53/patches/r1s-h5.patch

@@ -1,11 +0,0 @@
---- a/target/linux/sunxi/image/cortexa53.mk
-+++ b/target/linux/sunxi/image/cortexa53.mk
-@@ -43,7 +43,7 @@ TARGET_DEVICES += friendlyarm_nanopi-neo2
- define Device/friendlyarm_nanopi-r1s-h5
-   DEVICE_VENDOR := FriendlyARM
-   DEVICE_MODEL := Nanopi R1S H5
--  DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-usb-net-rtl8152
-+  DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-usb-net-rtl8152 kmod-rtl8189es
-   SUPPORTED_DEVICES:=nanopi-r1s-h5
-   $(Device/sun50i-h5)
- endef

devices/x86_64/diy.sh

@@ -6,9 +6,11 @@ bash $SHELL_FOLDER/../common/kernel_5.15.sh
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/x86/patches-5.15 target/linux/x86/patches-5.15
 rm -rf target/linux/x86/patches-5.15/.svn
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-x86 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-i915-gvt kmod-mlx4-core kmod-mlx5-core fdisk lsblk/' target/linux/x86/Makefile
+curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
+
+sed -i "s/ +PACKAGE_kmod-backlight:kmod-backlight//" package/kernel/linux/modules/video.mk
 
-sed -i 's/FEATURES:=/FEATURES:=usb usbgadget/' target/linux/x86/Makefile
+sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += autocore-x86 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-i915-gvt kmod-mlx4-core kmod-mlx5-core fdisk lsblk/' target/linux/x86/Makefile
 
 mv -f tmp/r81* feeds/kiddin9/
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk

devices/x86_64/patches/video.patch

@@ -1,99 +0,0 @@
-From d990f23c514708418a2222cfd20dcc3478f9a522 Mon Sep 17 00:00:00 2001
-From: kiddin9 <[email protected]>
-Date: Mon, 23 May 2022 14:55:01 +0800
-Subject: [PATCH] Update video.mk
-
----
- package/kernel/linux/modules/video.mk | 63 +++++++++++++++++++++++++--
- 1 file changed, 59 insertions(+), 4 deletions(-)
-
-diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk
-index 2a306b5f4289..0a759dd0ebcd 100644
---- a/package/kernel/linux/modules/video.mk
-+++ b/package/kernel/linux/modules/video.mk
-@@ -220,13 +220,35 @@ endef
- 
- $(eval $(call KernelPackage,fb-tft-ili9486))
- 
-+define KernelPackage/multimedia-input
-+  SUBMENU:=$(VIDEO_MENU)
-+  TITLE:=Multimedia input support
-+  DEPENDS:=+kmod-input-core
-+  KCONFIG:=CONFIG_RC_CORE \
-+	CONFIG_LIRC=y \
-+	CONFIG_RC_DECODERS=y \
-+	CONFIG_RC_DEVICES=y
-+  FILES:=$(LINUX_DIR)/drivers/media/rc/rc-core.ko
-+  AUTOLOAD:=$(call AutoProbe,rc-core)
-+endef
-+
-+define KernelPackage/multimedia-input/description
-+  Enable multimedia input.
-+endef
-+
-+$(eval $(call KernelPackage,multimedia-input))
- 
- define KernelPackage/drm
-   SUBMENU:=$(VIDEO_MENU)
-   TITLE:=Direct Rendering Manager (DRM) support
-   HIDDEN:=1
--  DEPENDS:=+kmod-dma-buf +kmod-i2c-core +PACKAGE_kmod-backlight:kmod-backlight
--  KCONFIG:=CONFIG_DRM
-+ DEPENDS:=+kmod-dma-buf +kmod-i2c-core +kmod-i2c-algo-bit
-+  KCONFIG:=	\
-+	CONFIG_DRM	\
-+	CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y	\
-+	CONFIG_DRM_FBDEV_EMULATION=y \
-+	CONFIG_DRM_FBDEV_OVERALLOC=100 \
-+	CONFIG_HDMI
-   FILES:= \
- 	$(LINUX_DIR)/drivers/gpu/drm/drm.ko \
- 	$(LINUX_DIR)/drivers/gpu/drm/drm_panel_orientation_quirks.ko
-@@ -300,8 +322,6 @@ define KernelPackage/drm-imx
-   TITLE:=Freescale i.MX DRM support
-   DEPENDS:=@TARGET_imx +kmod-drm-kms-helper
-   KCONFIG:=CONFIG_DRM_IMX \
--	CONFIG_DRM_FBDEV_EMULATION=y \
--	CONFIG_DRM_FBDEV_OVERALLOC=100 \
- 	CONFIG_IMX_IPUV3_CORE \
- 	CONFIG_RESET_CONTROLLER=y \
- 	CONFIG_DRM_IMX_IPUV3 \
-@@ -1028,3 +1048,38 @@ define KernelPackage/video-gspca-konica/description
- endef
- 
- $(eval $(call KernelPackage,video-gspca-konica))
-+
-+define KernelPackage/drm-i915
-+  SUBMENU:=$(VIDEO_MENU)
-+  TITLE:=Intel GPU drm support
-+  DEPENDS:=@TARGET_x86 +kmod-drm-ttm +kmod-drm-kms-helper +i915-firmware
-+  KCONFIG:=	\
-+          CONFIG_INTEL_GTT=y			\
-+          CONFIG_DRM_I915=m			\
-+          CONFIG_DRM_I915_CAPTURE_ERROR=y	\
-+          CONFIG_DRM_I915_COMPRESS_ERROR=y	\
-+          CONFIG_DRM_I915_USERPTR=y		\
-+          CONFIG_DRM_I915_GVT=y			\
-+          CONFIG_DRM_I915_WERROR=n		\
-+          CONFIG_DRM_I915_DEBUG=n		\
-+          CONFIG_DRM_I915_DEBUG_MMIO=n		\
-+          CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS=n	\
-+          CONFIG_DRM_I915_SW_FENCE_CHECK_DAG=n	\
-+          CONFIG_DRM_I915_DEBUG_GUC=n		\
-+          CONFIG_DRM_I915_SELFTEST=n		\
-+          CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS=n	\
-+          CONFIG_DRM_I915_DEBUG_VBLANK_EVADE=n	\
-+          CONFIG_DRM_I915_DEBUG_RUNTIME_PM=n
-+  FILES:=$(LINUX_DIR)/drivers/gpu/drm/i915/i915.ko
-+  AUTOLOAD:=$(call AutoProbe,i915)
-+endef
-+
-+define KernelPackage/drm-i915/description
-+  Direct Rendering Manager (DRM) support for "Intel Graphics
-+  Media Accelerator" or "HD Graphics" integrated graphics,
-+  including 830M, 845G, 852GM, 855GM, 865G, 915G, 945G, 965G,
-+  G35, G41, G43, G45 chipsets and Celeron, Pentium, Core i3,
-+  Core i5, Core i7 as well as Atom CPUs with integrated graphics.
-+endef
-+
-+$(eval $(call KernelPackage,drm-i915))