update

devices/mediatek_mt7981/.config

@@ -2,9 +2,121 @@
 CONFIG_TARGET_mediatek=y
 CONFIG_TARGET_mediatek_mt7981=y
 CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_mt7981-360-t7=y
 CONFIG_TARGET_DEVICE_mediatek_mt7981_DEVICE_mt7981-360-t7-108M=y
 
+CONFIG_VERSION_DIST="OpenWrt"
+CONFIG_PACKAGE_kmod-nft-fullcone=n
+CONFIG_PACKAGE_kmod-ax25=n
+CONFIG_PACKAGE_kmod-fast-classifier=n
+CONFIG_PACKAGE_kmod-shortcut-fe=n
+CONFIG_PACKAGE_kmod-shortcut-fe-cm=n
+CONFIG_PACKAGE_kmod-mpls=n
+CONFIG_PACKAGE_kmod-netem=n
+CONFIG_PACKAGE_kmod-sched=n
+CONFIG_PACKAGE_kmod-sched-act-vlan=n
+CONFIG_PACKAGE_kmod-sched-bpf=n
+CONFIG_PACKAGE_kmod-sched-cake=n
+CONFIG_PACKAGE_kmod-sched-connmark=n
+CONFIG_PACKAGE_kmod-sched-core=n
+CONFIG_PACKAGE_kmod-sched-ctinfo=n
+CONFIG_PACKAGE_kmod-sched-flower=n
+CONFIG_PACKAGE_kmod-sched-ipset=n
+CONFIG_PACKAGE_kmod-sched-mqprio=n
+CONFIG_PACKAGE_dockerd=n
+
+CONFIG_MTK_ACK_CTS_TIMEOUT_SUPPORT=y
+CONFIG_MTK_AIR_MONITOR=y
+CONFIG_MTK_AMPDU_CONF_SUPPORT=y
+CONFIG_MTK_ANTENNA_CONTROL_SUPPORT=y
+CONFIG_MTK_APCLI_SUPPORT=y
+CONFIG_MTK_ATE_SUPPORT=y
+CONFIG_MTK_BACKGROUND_SCAN_SUPPORT=y
+CONFIG_MTK_CAL_BIN_FILE_SUPPORT=y
+CONFIG_MTK_CFG_SUPPORT_FALCON_MURU=y
+CONFIG_MTK_CFG_SUPPORT_FALCON_PP=y
+CONFIG_MTK_CFG_SUPPORT_FALCON_SR=y
+CONFIG_MTK_CFG_SUPPORT_FALCON_TXCMD_DBG=y
+CONFIG_MTK_CHIP_MT7981=y
+CONFIG_MTK_CONNINFRA_APSOC=y
+CONFIG_MTK_CONNINFRA_APSOC_MT7981=y
+CONFIG_MTK_CON_WPS_SUPPORT=y
+CONFIG_MTK_DBDC_MODE=y
+CONFIG_MTK_DOT11K_RRM_SUPPORT=y
+CONFIG_MTK_DOT11R_FT_SUPPORT=y
+CONFIG_MTK_DOT11W_PMF_SUPPORT=y
+CONFIG_MTK_DOT11_HE_AX=y
+CONFIG_MTK_DOT11_N_SUPPORT=y
+CONFIG_MTK_DOT11_VHT_AC=y
+CONFIG_MTK_FAST_NAT_SUPPORT=y
+CONFIG_MTK_FIRST_IF_EEPROM_FLASH=y
+CONFIG_MTK_FIRST_IF_IPAILNA=y
+CONFIG_MTK_FIRST_IF_MT7981=y
+CONFIG_MTK_GREENAP_SUPPORT=y
+CONFIG_MTK_G_BAND_256QAM_SUPPORT=y
+CONFIG_MTK_HDR_TRANS_RX_SUPPORT=y
+CONFIG_MTK_HDR_TRANS_TX_SUPPORT=y
+CONFIG_MTK_ICAP_SUPPORT=y
+CONFIG_MTK_IGMP_SNOOP_SUPPORT=y
+CONFIG_MTK_INTERWORKING=y
+CONFIG_MTK_MAP_R2_VER_SUPPORT=y
+CONFIG_MTK_MAP_R3_VER_SUPPORT=y
+CONFIG_MTK_MAP_SUPPORT=y
+CONFIG_MTK_MBSS_DTIM_SUPPORT=y
+CONFIG_MTK_MBSS_SUPPORT=y
+CONFIG_MTK_MCAST_RATE_SPECIFIC=y
+CONFIG_MTK_MEMORY_SHRINK=y
+CONFIG_MTK_MGMT_TXPWR_CTRL=y
+CONFIG_MTK_MLME_MULTI_QUEUE_SUPPORT=y
+CONFIG_MTK_MT_AP_SUPPORT=m
+CONFIG_MTK_MT_DFS_SUPPORT=y
+CONFIG_MTK_MT_MAC=y
+CONFIG_MTK_MT_WIFI=m
+CONFIG_MTK_MT_WIFI_PATH="mt_wifi"
+CONFIG_MTK_MUMIMO_SUPPORT=y
+CONFIG_MTK_MU_RA_SUPPORT=y
+CONFIG_MTK_OFFCHANNEL_SCAN_FEATURE=y
+CONFIG_MTK_OWE_SUPPORT=y
+CONFIG_MTK_QOS_R1_SUPPORT=y
+CONFIG_MTK_RA_PHY_RATE_SUPPORT=y
+CONFIG_MTK_RED_SUPPORT=y
+CONFIG_MTK_RTMP_FLASH_SUPPORT=y
+CONFIG_MTK_RT_FIRST_CARD_EEPROM="flash"
+CONFIG_MTK_RT_FIRST_IF_RF_OFFSET=0xc0000
+CONFIG_MTK_SCS_FW_OFFLOAD=y
+CONFIG_MTK_SECOND_IF_NONE=y
+CONFIG_MTK_SMART_CARRIER_SENSE_SUPPORT=y
+CONFIG_MTK_SPECTRUM_SUPPORT=y
+CONFIG_MTK_SUPPORT_OPENWRT=y
+CONFIG_MTK_THIRD_IF_NONE=y
+CONFIG_MTK_TPC_SUPPORT=y
+CONFIG_MTK_TXBF_SUPPORT=y
+CONFIG_MTK_UAPSD=y
+CONFIG_MTK_VLAN_SUPPORT=y
+CONFIG_MTK_VOW_SUPPORT=y
+CONFIG_MTK_WARP_V2=y
+CONFIG_MTK_WDS_SUPPORT=y
+CONFIG_MTK_WHNAT_SUPPORT=m
+CONFIG_MTK_WIFI_BASIC_FUNC=y
+CONFIG_MTK_WIFI_DRIVER=y
+CONFIG_MTK_WIFI_EAP_FEATURE=y
+CONFIG_MTK_WIFI_FW_BIN_LOAD=y
+CONFIG_MTK_WIFI_MODE_AP=m
+CONFIG_MTK_WIFI_MT_MAC=y
+CONFIG_MTK_WIFI_TWT_SUPPORT=y
+CONFIG_MTK_WLAN_HOOK=y
+CONFIG_MTK_WLAN_SERVICE=y
+CONFIG_MTK_WNM_SUPPORT=y
+CONFIG_MTK_WPA3_SUPPORT=y
+CONFIG_MTK_WSC_INCLUDED=y
+CONFIG_MTK_WSC_V2_SUPPORT=y
+
+CONFIG_CONNINFRA_AUTO_UP=y
+CONFIG_CONNINFRA_EMI_SUPPORT=y
+
+CONFIG_WARP_CHIPSET="mt7981"
+CONFIG_WARP_VERSION=2
+CONFIG_WED_HW_RRO_SUPPORT=y
+CONFIG_first_card_name="MT7981"
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 

devices/mediatek_mt7981/diy.sh

@@ -4,5 +4,10 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
+kernel_v="$(cat include/kernel-version.mk | grep LINUX_KERNEL_HASH-5.* | cut -f 2 -d - | cut -f 1 -d ' ')"
+echo "KERNEL=${kernel_v}" >> $GITHUB_ENV || true
+sed -i "s?targets/%S/packages?targets/%S/$kernel_v?" include/feeds.mk
+
 rm -rf devices/common/patches/{imagebuilder.patch,iptables.patch,kernel-defaults.patch,targets.patch}
 
+

devices/mediatek_mt7981/feeds.conf

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

devices/mediatek_mt7981/patches/base-files.patch

@@ -0,0 +1,22 @@
+--- a/package/feeds/kiddin9/base-files/Makefile
++++ b/package/feeds/kiddin9/base-files/Makefile
+@@ -205,6 +205,9 @@ define Package/base-files/install
+ 
+ 	$(if $(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE), \
+ 		rm -f $(1)/etc/banner.failsafe,)
++
++	$(if $(CONFIG_PACKAGE_wifi-profile), \
++		rm -f $(1)/sbin/wifi)
+ endef
+ 
+ ifneq ($(DUMP),1)
+
+--- a/package/feeds/kiddin9/base-files/files/etc/hotplug.d/net/00-sysctl
++++ b/package/feeds/kiddin9/base-files/files/etc/hotplug.d/net/00-sysctl
+@@ -6,4 +6,6 @@ if [ "$ACTION" = add ]; then
+ 		sed -ne "/^[[:space:]]*net\..*\.$DEVICENAME\./p" "$CONF" | \
+ 			sysctl -e -p - | logger -t sysctl
+ 	done
++
++	[ -f /sbin/smp.sh ] && /sbin/smp.sh
+ fi

devices/mediatek_mt7981/patches/depends.patch

@@ -1,10 +1,10 @@
 --- a/target/linux/mediatek/image/mt7981.mk
 +++ b/target/linux/mediatek/image/mt7981.mk
-@@ -177,6 +177,7 @@ define Device/mt7981-360-t7
-   DEVICE_MODEL := 360 T7
-   DEVICE_DTS := mt7981-360-t7
+@@ -194,6 +194,7 @@ define Device/mt7981-360-t7-108M
+   DEVICE_MODEL := 360 T7 (with 108M ubi)
+   DEVICE_DTS := mt7981-360-t7-108M
    DEVICE_DTS_DIR := $(DTS_DIR)/mediatek
-+  DEVICE_PACKAGES := luci-app-mtk mii_mgr wifi-profile switch regs kmod-warp kmod-mt_wifi kmod-mediatek_hnat kmod-conninfra
++  DEVICE_PACKAGES := luci-app-mtk mii_mgr wifi-profile switch regs kmod-warp kmod-mt_wifi kmod-mediatek_hnat kmod-conninfra datconf-lua
    SUPPORTED_DEVICES := 360,t7
    UBINIZE_OPTS := -E 5
    BLOCKSIZE := 128k

devices/mediatek_mt7981/patches/netifd.patch

@@ -0,0 +1,36 @@
+--- a/package/feeds/kiddin9/netifd/files/etc/init.d/network
++++ b/package/feeds/kiddin9/netifd/files/etc/init.d/network
+@@ -30,7 +30,7 @@ reload_service() {
+ 
+ 	init_switch
+ 	ubus call network reload || rv=1
+-	/sbin/wifi reload_legacy
++	/sbin/wifi up
+ 	return $rv
+ }
+ 
+@@ -40,6 +40,14 @@ stop_service() {
+ 	sleep 1
+ }
+ 
++
++
++
++service_running() {
++        ubus -t 120 wait_for network.interface.lan
++        /sbin/wifi reload_legacy
++}
++
+ validate_atm_bridge_section()
+ {
+ 	uci_validate_section network "atm-bridge" "${1}" \
+@@ -139,6 +147,7 @@ service_triggers()
+ }
+ 
+ shutdown() {
+-	ifdown -a
+-	sleep 1
++        /sbin/wifi down
++        ifdown -a
++        sleep 1
+ }

devices/ramips_mt76x8/patches/hc5611.patch

@@ -1,9 +1,8 @@
-From 1a9e3658471433376dc3896b549aade18bd6a373 Mon Sep 17 00:00:00 2001
-From: Senis <[email protected]>
+From a8f3c97ce83dc97cd7acb040a715ecd75d824161 Mon Sep 17 00:00:00 2001
+From: Senis John <[email protected]>
 Date: Sat, 19 Nov 2022 11:30:54 +0800
 Subject: [PATCH] ramips: add support for HiWiFi HC5611
 
-### Hardware:
 CPU: MediaTek MT7628AN @ 575 MHz
 Flash: 16 MB
 RAM: 128 MB
@@ -13,37 +12,34 @@ USB: USB 2.0 x 1
 LED: red/green x 1
 Button: reset x 1
 
-### Installation
-
 1. Open https://www.hiwifi.wtf/, Get Cloud token and unlock ssh
 2. Upload the openwrt firmware to the router via SCP
 3. Login the router via SSH
 4. Run `mtd -r write path_to_firmware.bin firmware`
 
-### Others
 I have tested on my device.
-```
 - The LED will display RED on power-on, After system start completed, trun GREEN
 - Reset button working now. Long press after 5s will reset factory. Short press less 1s will reboot the device
 - USB can working under official u-boot
-```
 
-Signed-off-by: Senis Y <[email protected]>
+Signed-off-by: Senis John <[email protected]>
 ---
- .../ramips/dts/mt7628an_hiwifi_hc5611.dts     | 29 +++++++++++++++++++
+ .../ramips/dts/mt7628an_hiwifi_hc5611.dts     | 30 +++++++++++++++++++
  target/linux/ramips/image/mt76x8.mk           |  8 +++++
  .../mt76x8/base-files/etc/board.d/01_leds     |  3 ++
  .../mt76x8/base-files/etc/board.d/02_network  |  2 ++
  .../etc/hotplug.d/ieee80211/10_fix_wifi_mac   |  1 +
- 5 files changed, 43 insertions(+)
+ 5 files changed, 44 insertions(+)
  create mode 100644 target/linux/ramips/dts/mt7628an_hiwifi_hc5611.dts
 
 diff --git a/target/linux/ramips/dts/mt7628an_hiwifi_hc5611.dts b/target/linux/ramips/dts/mt7628an_hiwifi_hc5611.dts
 new file mode 100644
-index 0000000000000..10b12f16a89f6
+index 0000000000000..17de299b3cbc4
 --- /dev/null
 +++ b/target/linux/ramips/dts/mt7628an_hiwifi_hc5611.dts
-@@ -0,0 +1,29 @@
+@@ -0,0 +1,30 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++
 +#include "mt7628an_hiwifi_hc5x61a.dtsi"
 +
 +/ {
@@ -64,12 +60,11 @@ index 0000000000000..10b12f16a89f6
 +			gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
 +		};
 +	};
-+
 +};
 +
 +&state_default {
 +	gpio {
-+		groups = "i2c", "refclk", "wdt", "wled_an";
++		groups = "gpio", "spi cs1", "wdt";
 +		function = "gpio";
 +	};
 +};
@@ -125,16 +120,4 @@ index 38ff38bac5fea..d85cdf3db7fac 100644
 +	hiwifi,hc5611|\
  	hiwifi,hc5661a|\
  	hiwifi,hc5761a|\
- 	hiwifi,hc5861b)
-diff --git a/target/linux/ramips/mt76x8/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ramips/mt76x8/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
-index b8f8faee9ca28..c9e205a0fc143 100644
---- a/target/linux/ramips/mt76x8/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
-+++ b/target/linux/ramips/mt76x8/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
-@@ -10,6 +10,7 @@ PHYNBR=${DEVPATH##*/phy}
- board=$(board_name)
- 
- case "$board" in
-+	hiwifi,hc5611|\
- 	hiwifi,hc5661a|\
- 	hiwifi,hc5761a|\
- 	hiwifi,hc5861b)
+ 	hiwifi,hc5861b)

devices/x86_64/diy.sh

@@ -19,12 +19,18 @@ mv -f tmp/r81* feeds/kiddin9/
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/64.mk
 sed -i 's/256/1024/g' target/linux/x86/image/Makefile
 
-sed -i "s/and \$(findstring ext4,\$(1)),//" include/image.mk
-
 echo '
 CONFIG_ACPI=y
 CONFIG_X86_ACPI_CPUFREQ=y
 CONFIG_NR_CPUS=512
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
+CONFIG_SDIO_UART=y
+CONFIG_MMC_TEST=y
+CONFIG_MMC_DEBUG=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ACPI=y
+CONFIG_MMC_SDHCI_PCI=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

@@ -19,12 +19,18 @@ mv -f tmp/r81* feeds/kiddin9/
 sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/x86/image/*.mk
 sed -i 's/256/1024/g' target/linux/x86/image/Makefile
 
-sed -i "s/and \$(findstring ext4,\$(1)),//" include/image.mk
-
 echo '
 CONFIG_ACPI=y
 CONFIG_X86_ACPI_CPUFREQ=y
 CONFIG_NR_CPUS=512
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=y
+CONFIG_SDIO_UART=y
+CONFIG_MMC_TEST=y
+CONFIG_MMC_DEBUG=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ACPI=y
+CONFIG_MMC_SDHCI_PCI=y
 ' >> ./target/linux/x86/config-5.15
 
 sed -i "s/DEVICE_MODEL := x86/DEVICE_MODEL := x86\/32/" target/linux/x86/image/generic.mk