diff --git a/package/boot/uboot-mediatek/Makefile b/package/boot/uboot-mediatek/Makefile index 87d7741ff04..4d062749a8b 100644 --- a/package/boot/uboot-mediatek/Makefile +++ b/package/boot/uboot-mediatek/Makefile @@ -470,7 +470,7 @@ define U-Boot/mt7981_konka_komi-a31 endef define U-Boot/mt7981_netis_nx30v2 - NAME:=Netis NX30V2 + NAME:=netis NX30 V2 BUILD_SUBTARGET:=filogic BUILD_DEVICES:=netis_nx30v2 UBOOT_CONFIG:=mt7981_netis_nx30v2 diff --git a/package/boot/uboot-mediatek/patches/461-add-netis-nx30v2.patch b/package/boot/uboot-mediatek/patches/461-add-netis-nx30v2.patch index 6a376a2b6c5..66bc031dc60 100644 --- a/package/boot/uboot-mediatek/patches/461-add-netis-nx30v2.patch +++ b/package/boot/uboot-mediatek/patches/461-add-netis-nx30v2.patch @@ -9,7 +9,7 @@ +#include + +/ { -+ model = "Netis NX30V2"; ++ model = "netis NX30 V2"; + compatible = "mediatek,mt7981", "mediatek,mt7981-rfb"; + chosen { + stdout-path = &uart0; @@ -385,10 +385,10 @@ + +#netconsole +netconsole=setenv stdout serial,nc;setenv stdin serial,nc -+nonetconcole=setenv stdout serial;setenv stdin serial ++nonetconsole=setenv stdout serial;setenv stdin serial + +# button commands -+button_cmd_0=run netconsole led_on; sleep 5; if button wps; then run nonetconcole offical_upgrade; fi ++button_cmd_0=run netconsole led_on; sleep 5; if button wps; then run nonetconsole offical_upgrade; fi +button_cmd_0_name=wps -+button_cmd_1=run netconsole led_on reset_all; sleep 5; if button reset; then run nonetconcole; while true; do run upgrade_fw && run boot_nand; done; fi ++button_cmd_1=run netconsole led_on reset_all; sleep 5; if button reset; then run nonetconsole; while true; do run upgrade_fw && run boot_nand; done; fi +button_cmd_1_name=reset diff --git a/target/linux/mediatek/dts/mt7981b-netis-nx30v2.dts b/target/linux/mediatek/dts/mt7981b-netis-nx30v2.dts index cbd6666d49c..1e3a6b5577f 100644 --- a/target/linux/mediatek/dts/mt7981b-netis-nx30v2.dts +++ b/target/linux/mediatek/dts/mt7981b-netis-nx30v2.dts @@ -4,6 +4,7 @@ #include "mt7981b-netis-common.dtsi" / { + model = "netis NX30 V2"; compatible = "netis,nx30v2", "mediatek,mt7981"; aliases { @@ -36,6 +37,20 @@ gpios = <&pio 5 GPIO_ACTIVE_LOW>; }; + wifi2g { + color = ; + function = LED_FUNCTION_WLAN_2GHZ; + gpios = <&pio 34 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + wifi5g { + color = ; + function = LED_FUNCTION_WLAN_5GHZ; + gpios = <&pio 35 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy1tpt"; + }; + wan { color = ; function = LED_FUNCTION_WAN; diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index bddbf26c6e9..bd23cc09ce3 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -2556,16 +2556,19 @@ endef TARGET_DEVICES += netgear_wax220 define Device/netis_nx30v2 - DEVICE_VENDOR := Netis - DEVICE_MODEL := NX30V2 + DEVICE_VENDOR := netis + DEVICE_MODEL := NX30 + DEVICE_VARIANT := V2 DEVICE_ALT0_VENDOR := Netcore - DEVICE_ALT0_MODEL := POWER30AX + DEVICE_ALT0_MODEL := POWER 30AX DEVICE_ALT1_VENDOR := Netcore - DEVICE_ALT1_MODEL := N30PRO + DEVICE_ALT1_MODEL := N30 Pro DEVICE_ALT2_VENDOR := GWBN DEVICE_ALT2_MODEL := GW3001 DEVICE_ALT3_VENDOR := GLC DEVICE_ALT3_MODEL := W7 + DEVICE_ALT4_VENDOR := netis + DEVICE_ALT4_MODEL := MEX605 DEVICE_DTS := mt7981b-netis-nx30v2 DEVICE_DTS_DIR := ../dts DEVICE_DTC_FLAGS := --pad 4096