update

.github/workflows/Openwrt-AutoBuild.yml

@@ -157,10 +157,10 @@ jobs:
       env:
         DEBIAN_FRONTEND: noninteractive
       run: |
-        sudo mkdir -p -m 777 /mnt/openwrt/dl /mnt/openwrt/bin /mnt/openwrt/staging_dir
+        sudo mkdir -p -m 777 /mnt/openwrt/dl /mnt/openwrt/staging_dir /mnt/openwrt/build_dir
         ln -sf /mnt/openwrt/dl openwrt/dl
-        ln -sf /mnt/openwrt/bin openwrt/bin
         ln -sf /mnt/openwrt/staging_dir openwrt/staging_dir
+        ln -sf /mnt/openwrt/build_dir openwrt/build_dir
 
     - name: Load custom configuration
       run: |

devices/common/.config

@@ -104,9 +104,6 @@ CONFIG_PACKAGE_kmod-pcie_mhi=n
 
 CONFIG_PACKAGE_kmod-mii=n
 
-
-
-
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
 

devices/mediatek_filogic/.config

@@ -29,3 +29,4 @@ CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_cmcc_a10=y
 CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_konka_komi-a31=y
 CONFIG_TARGET_DEVICE_mediatek_filogic_DEVICE_imou_lc-hx3001=y
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
+

devices/mediatek_filogic/diy/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-nand.dts

@@ -5,7 +5,7 @@
 
 / {
 	model = "CMCC RAX3000M (NAND version)";
-	compatible = "cmcc,rax3000m-nand", "mediatek,mt7981";
+	compatible = "cmcc,rax3000m", "mediatek,mt7981";
 
 	aliases {
 		label-mac-device = &gmac1;

devices/mediatek_filogic/patches/08-cmcc_rax3000m.patch

@@ -9,17 +9,6 @@
  	h3c,magic-nx30-pro)
  		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" eth1
  		;;
-@@ -103,9 +103,7 @@ mediatek_setup_macs()
- 		wan_mac=$(macaddr_add "$lan_mac" 3)
- 		label_mac=$lan_mac
- 		;;
--	cmcc,rax3000m)
--		case "$(cmdline_get_var root)" in
--		/dev/mmc*)
-+	cmcc,rax3000m-emmc)
- 			wan_mac=$(mmc_get_mac_binary factory 0x2a)
- 			lan_mac=$(mmc_get_mac_binary factory 0x24)
- 			label_mac=$wan_mac
 
 --- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
 +++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac

devices/mediatek_mt7981/.config

@@ -11,6 +11,7 @@ CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_nradio_wt9103_512m=y
 
 CONFIG_VERSION_DIST="OpenWrt"
 
+CONFIG_PACKAGE_dnsmasq_full_nftset=n
 
 CONFIG_DEVEL=y
 CONFIG_TOOLCHAINOPTS=y

devices/meson_meson8b/diy.sh

@@ -8,7 +8,7 @@ git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/
 
 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
+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/qualcommax_ipq60xx/.config

@@ -1,13 +1,6 @@
 CONFIG_TARGET_qualcommax=y
 CONFIG_TARGET_qualcommax_ipq60xx=y
 CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_DEVICE_qualcommax_ipq60xx_DEVICE_cmiot_ax18=y
-CONFIG_TARGET_DEVICE_qualcommax_ipq60xx_DEVICE_glinet_gl-ax1800=y
-CONFIG_TARGET_DEVICE_qualcommax_ipq60xx_DEVICE_glinet_gl-axt1800=y
-CONFIG_TARGET_DEVICE_qualcommax_ipq60xx_DEVICE_qihoo_360v6=y
-CONFIG_TARGET_DEVICE_qualcommax_ipq60xx_DEVICE_zn_m2=y
 CONFIG_TARGET_ALL_PROFILES=y
 
-CONFIG_PACKAGE_kmod-qca-nss-cfi-cryptoapi=n
-
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务

devices/qualcommax_ipq60xx/README.md

@@ -1 +1 @@
-源码来源 https://github.com/JiaY-shi/openwrt 感谢
+源码来源 https://github.com/coolsnowwolf/lede 感谢

devices/qualcommax_ipq60xx/diy.sh

@@ -4,8 +4,17 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-git clone https://github.com/JiaY-shi/nss-packages.git package/nss-packages
+git_clone_path master https://github.com/coolsnowwolf/lede target/linux/generic/hack-6.1
+
+rm -rf target/linux/qualcommax package/kernel/qca-* package/boot/uboot-envtools package/firmware/ipq-wifi
+git_clone_path master https://github.com/coolsnowwolf/lede target/linux/qualcommax
+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
+
 
-rm -rf feeds/kiddin9/{fibocom_QMI_WWAN,quectel_Gobinet,shortcut-fe}
 
-rm -rf devices/common/patches/rootfstargz.patch devices/common/patches/kernel_version.patch

devices/qualcommax_ipq60xx/diy/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6000-360v6.dts

@@ -1,206 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-/dts-v1/;
-
-#include "ipq6018-512m.dtsi"
-#include "ipq6018-ess.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-/ {
-	model = "Qihoo 360V6";
-	compatible = "qihoo,360v6", "qcom,ipq6018";
-
-	aliases {
-		serial0 = &blsp1_uart3;
-		led-boot = &led_green;
-		led-failsafe = &led_red;
-		led-running = &led_green;
-		led-upgrade = &led_orange;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-		bootargs-append = " root=/dev/ubiblock0_1";
-	};
-
-	keys {
-		compatible = "gpio-keys";
-
-		wps {
-			label = "wps";
-			linux,code = <KEY_WPS_BUTTON>;
-			gpios = <&tlmm 19 GPIO_ACTIVE_LOW>;
-		};
-
-		reset {
-			label = "reset";
-			linux,code = <KEY_RESTART>;
-			gpios = <&tlmm 68 GPIO_ACTIVE_LOW>;
-		};
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_red: status_red {
-			label = "red:status";
-			gpio = <&tlmm 71 GPIO_ACTIVE_HIGH>;
-		};
-
-		led_orange: status_orange {
-			label = "orange:status";
-			gpio = <&tlmm 72 GPIO_ACTIVE_HIGH>;
-		};
-
-		led_green: status_green {
-			label = "green:status";
-			gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&tlmm {
-	mdio_pins: mdio-pins {
-		mdc {
-			pins = "gpio64";
-			function = "mdc";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		mdio {
-			pins = "gpio65";
-			function = "mdio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-	};
-};
-
-&blsp1_uart3 {
-	pinctrl-0 = <&serial_3_pins>;
-	pinctrl-names = "default";
-	status = "okay";
-};
-
-&qpic_nand {
-	status = "okay";
-
-	nand@0 {
-		reg = <0>;
-		nand-ecc-strength = <4>;
-		nand-ecc-step-size = <512>;
-		nand-bus-width = <8>;
-
-		partitions {
-			compatible = "qcom,smem-part";
-		};
-	};
-};
-
-&qusb_phy_0 {
-	status = "okay";
-};
-
-&ssphy_0 {
-	status = "okay";
-};
-
-&usb3 {
-	status = "okay";
-};
-
-&mdio {
-	status = "okay";
-
-	pinctrl-0 = <&mdio_pins>;
-	pinctrl-names = "default";
-	reset-gpios = <&tlmm 75 GPIO_ACTIVE_LOW>;
-
-	qca8075_0: ethernet-phy@0 {
-		compatible = "ethernet-phy-ieee802.3-c22";
-		reg = <0>;
-	};
-
-	qca8075_1: ethernet-phy@1 {
-		compatible = "ethernet-phy-ieee802.3-c22";
-		reg = <1>;
-	};
-
-	qca8075_2: ethernet-phy@2 {
-		compatible = "ethernet-phy-ieee802.3-c22";
-		reg = <2>;
-	};
-
-	qca8075_3: ethernet-phy@3 {
-		compatible = "ethernet-phy-ieee802.3-c22";
-		reg = <3>;
-	};
-};
-
-&switch {
-	status = "okay";
-
-	switch_cpu_bmp = <0x1>;  /* cpu port bitmap */
-	switch_lan_bmp = <0xe>;  /* lan port bitmap */
-	switch_wan_bmp = <0x10>; /* wan port bitmap */
-	switch_inner_bmp = <0xc0>; /*inner port bitmap*/
-	switch_mac_mode = <0x0>; /* mac mode for uniphy 0*/
-	switch_mac_mode1 = <0xff>; /* mac mode for uniphy 1*/
-	switch_mac_mode2 = <0xff>; /* mac mode for uniphy 2*/
-
-	qcom,port_phyinfo {
-		port@0 {
-			port_id = <1>;
-			phy_address = <0>;
-		};
-		port@1 {
-			port_id = <2>;
-			phy_address = <1>;
-		};
-		port@2 {
-			port_id = <3>;
-			phy_address = <2>;
-		};
-		port@3 {
-			port_id = <4>;
-			phy_address = <3>;
-		};
-	};
-};
-
-&edma {
-	status = "okay";
-};
-
-&dp1 {
-	status = "okay";
-	phy-handle = <&qca8075_0>;
-	label = "wan";
-};
-
-&dp2 {
-	status = "okay";
-	phy-handle = <&qca8075_1>;
-	label = "lan1";
-};
-
-&dp3 {
-	status = "okay";
-	phy-handle = <&qca8075_2>;
-	label = "lan2";
-};
-
-&dp4 {
-	status = "okay";
-	phy-handle = <&qca8075_3>;
-	label = "lan3";
-};
-
-&wifi {
-	status = "okay";
-
-	qcom,ath11k-fw-memory-mode = <1>;
-};

devices/qualcommax_ipq60xx/diy/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq6018-m2.dts

@@ -1,82 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+)
-
-/dts-v1/;
-
-#include "ipq6018-cmiot.dtsi"
-
-/ {
-	model = "ZN M2";
-	compatible = "zn,m2", "qcom,ipq6018";
-
-	aliases {
- 		led-boot = &led_power;
- 		led-failsafe = &led_power;
- 		led-running = &led_power;
- 		led-upgrade = &led_power;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-0 = <&leds_pins>;
-		pinctrl-names = "default";
-
-		led_power: power {
-			label = "m2:blue:power";
-			gpio = <&tlmm 58 GPIO_ACTIVE_HIGH>;
-		};
-
-		mesh {
-			label = "m2:blue:mesh";
-			gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>;
-		};
-
-		lan {
-			label = "m2:blue:lan";
-			gpio = <&tlmm 74 GPIO_ACTIVE_HIGH>;
-		};
-
-		wan {
-			label = "m2:blue:wan";
-			gpio = <&tlmm 37 GPIO_ACTIVE_HIGH>;
-		};
-
-		wlan5g {
-			label = "m2:blue:wlan5g";
-			gpio = <&tlmm 35 GPIO_ACTIVE_HIGH>;
-		};
-
-		wlan2g {
-			label = "m2:blue:wlan2g";
-			gpio = <&tlmm 70 GPIO_ACTIVE_HIGH>;
-		};
-	};
-};
-
-&tlmm {
-	leds_pins: leds_pins {
-		mux {
-			pins = "gpio35", "gpio37",
-				"gpio58", "gpio70",
-				"gpio73", "gpio74";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-down;
-		};
-	};
-};
-
-&qusb_phy_0 {
-status = "ok";
-};
-
-&ssphy_0 {
-status = "ok";
-};
-
-&usb3 {
-status = "ok";
-};
-
-&wifi {
-	qcom,ath11k-calibration-variant = "ZN-M2";
-};

devices/qualcommax_ipq60xx/feeds.conf

@@ -1,4 +0,0 @@
-src-git packages https://git.openwrt.org/feed/packages.git
-src-git luci https://git.openwrt.org/project/luci.git
-src-git routing https://git.openwrt.org/feed/routing.git
-src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master

devices/qualcommax_ipq60xx/patches/v6m2.patch

@@ -1,128 +0,0 @@
---- a/package/firmware/ipq-wifi/Makefile
-+++ b/package/firmware/ipq-wifi/Makefile
-@@ -54,7 +54,9 @@ ALLWIFIBOARDS:= \
- 	zte_mf289f \
- 	zte_mf287 \
- 	zte_mf287plus \
--	zyxel_nbg7815
-+	zyxel_nbg7815 \
-+	qihoo_360v6 \
-+	cmiot_ax18
- 
- ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
- 
-@@ -159,6 +161,8 @@ $(eval $(call generate-ipq-wifi-package,netgear_rax120v2,Netgear RAX120v2))
- $(eval $(call generate-ipq-wifi-package,netgear_wax218,Netgear WAX218))
- $(eval $(call generate-ipq-wifi-package,netgear_wax620,Netgear WAX620))
- $(eval $(call generate-ipq-wifi-package,netgear_wax630,Netgear WAX630))
-+$(eval $(call generate-ipq-wifi-package,qihoo_360v6,QIHOO 360V6))
-+$(eval $(call generate-ipq-wifi-package,zyxel_nbg7815,Zyxel NBG7815))
- $(eval $(call generate-ipq-wifi-package,qnap_301w,QNAP 301w))
- $(eval $(call generate-ipq-wifi-package,prpl_haze,prpl Haze))
- $(eval $(call generate-ipq-wifi-package,redmi_ax6,Redmi AX6))
-
---- a/target/linux/qualcommax/image/ipq60xx.mk
-+++ b/target/linux/qualcommax/image/ipq60xx.mk
-@@ -30,6 +30,32 @@ define Device/cmiot_ax18
- endef
- TARGET_DEVICES += cmiot_ax18
- 
-+define Device/qihoo_360v6
-+	$(call Device/FitImage)
-+	$(call Device/UbiFit)
-+	DEVICE_VENDOR := Qihoo 360
-+	DEVICE_MODEL := V6
-+	BLOCKSIZE := 128k
-+	PAGESIZE := 2048
-+	DEVICE_DTS_CONFIG := config@cp03-c1
-+	DEVICE_PACKAGES := ipq-wifi-qihoo_360v6
-+	SOC := ipq6000
-+endef
-+TARGET_DEVICES += qihoo_360v6
-+
-+define Device/zn_m2
-+	$(call Device/FitImage)
-+	$(call Device/UbiFit)
-+	DEVICE_VENDOR := ZN
-+	DEVICE_MODEL := M2
-+	BLOCKSIZE := 128k
-+	PAGESIZE := 2048
-+	DEVICE_DTS_CONFIG := config@cp03-c1
-+	DEVICE_PACKAGES := ipq-wifi-cmiot_ax18
-+	SOC := ipq6018
-+endef
-+TARGET_DEVICES += zn_m2
-+
- define Device/glinet_gl-ax1800
- 	$(call Device/FitImage)
- 	$(call Device/UbiFit)
-
---- a/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network
-+++ b/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/02_network
-@@ -11,9 +11,14 @@ ipq807x_setup_interfaces()
- 	local board="$1"
- 
- 	case "$board" in
--	cmiot,ax18)
-+	cmiot,ax18|\
-+	qihoo,v6|\
-+	zn,m2)
- 		ucidef_set_interfaces_lan_wan "eth1 eth2 eth3" "eth0"
--        ;;
-+		;;
-+	linksys,mr7350)
-+		ucidef_set_interfaces_lan_wan "eth0 eth1 eth2 eth3" "eth4"
-+		;;
- 	glinet,gl-ax1800)
- 		ucidef_set_interfaces_lan_wan "eth1 eth2 eth3 eth4" "eth0"
- 		;;
-
---- a/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/01_leds
-+++ b/target/linux/qualcommax/ipq60xx/base-files/etc/board.d/01_leds
-@@ -6,7 +6,8 @@ board_config_update
- board=$(board_name)
- 
- case "$board" in
--    cmiot,ax18)
-+    cmiot,ax18|\
-+    zn,m2)
-         ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth0"
-         ucidef_set_led_netdev "wlan2g" "WLAN2G" "blue:wlan2g" "wlan1"
-         ucidef_set_led_netdev "wlan5g" "WLAN5G" "blue:wlan5g" "wlan0"
-
---- a/target/linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/qualcommax/ipq60xx/base-files/lib/upgrade/platform.sh
-@@ -17,6 +17,8 @@ platform_pre_upgrade() {
- platform_do_upgrade() {
- 	case "$(board_name)" in
- 	cmiot,ax18|\
-+	qihoo,v6|\
-+	zn,m2|\
- 	glinet,gl-axt1800|\
- 	glinet,gl-ax1800)
- 		nand_do_upgrade "$1"
-
---- a/target/linux/qualcommax/ipq60xx/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
-+++ b/target/linux/qualcommax/ipq60xx/base-files/etc/hotplug.d/firmware/11-ath11k-caldata
-@@ -10,6 +10,9 @@ case "$FIRMWARE" in
- "ath11k/IPQ6018/hw1.0/cal-ahb-c000000.wifi.bin")
- 	case $(board_name) in
- 	cmiot,ax18|\
-+	linksys,mr7350|\
-+	qihoo,v6|\
-+	zn,m2|\
- 	glinet,gl-axt1800|\
- 	glinet,gl-ax1800)
- 		caldata_extract "0:art" 0x1000 0x10000
-
---- a/package/feeds/kiddin9/base-files/files/etc/init.d/led
-+++ b/package/feeds/kiddin9/base-files/files/etc/init.d/led
-@@ -76,6 +76,8 @@ load_led() {
- 		"netdev")
- 			[ -n "$dev" ] && {
- 				echo $dev > /sys/class/leds/${sysfs}/device_name
-+				[ -e "/sys/class/leds/${sysfs}/mode" ]  && \
-+					echo $mode > /sys/class/leds/${sysfs}/mode
- 				for m in $mode; do
- 					[ -e "/sys/class/leds/${sysfs}/$m" ] && \
- 						echo 1 > /sys/class/leds/${sysfs}/$m

devices/qualcommax_ipq60xx/settings.ini

@@ -1,2 +1,2 @@
-REPO_URL="https://github.com/JiaY-shi/openwrt"
-REPO_BRANCH="ipq60xx-devel_nss"
+REPO_URL="https://github.com/openwrt/openwrt"
+REPO_BRANCH="main"

devices/rockchip_armv8/patches/fix.patch

@@ -54,3 +54,17 @@ index 57d5b0f8d9be..73d9f52caf99 100644
  +CONFIG_SYSRESET=y
  +CONFIG_USB=y
  +CONFIG_USB_XHCI_HCD=y
+
+--- a/package/kernel/linux/modules/netdevices.mk
++++ b/package/kernel/linux/modules/netdevices.mk
+@@ -363,7 +363,9 @@ define KernelPackage/phy-aquantia
+   TITLE:=Aquantia Ethernet PHYs
+   DEPENDS:=+kmod-libphy +kmod-hwmon-core +kmod-lib-crc-ccitt
+   KCONFIG:=CONFIG_AQUANTIA_PHY
+-  FILES:=$(LINUX_DIR)/drivers/net/phy/aquantia/aquantia.ko
++  FILES:= \
++  $(LINUX_DIR)/drivers/net/phy/[email protected] \
++   $(LINUX_DIR)/drivers/net/phy/aquantia/[email protected]
+   AUTOLOAD:=$(call AutoLoad,18,aquantia,1)
+ endef
+ 

devices/x86_64/diy.sh

@@ -28,6 +28,7 @@ CONFIG_MMC_DEBUG=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PCI=y
+CONFIG_DRM_I915=y
 ' >> ./target/linux/x86/config-5.15
 
 sed -i "s/enabled '0'/enabled '1'/g" feeds/packages/utils/irqbalance/files/irqbalance.config

devices/x86_generic/diy.sh

@@ -26,6 +26,7 @@ CONFIG_MMC_DEBUG=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ACPI=y
 CONFIG_MMC_SDHCI_PCI=y
+CONFIG_DRM_I915=y
 ' >> ./target/linux/x86/config-5.15
 
 sed -i "s/DEVICE_MODEL := x86/DEVICE_MODEL := x86\/32/" target/linux/x86/image/generic.mk