From: Zhiwei Cao Date: Thu, 22 Jan 2026 06:52:59 +0000 (+0800) Subject: mediatek: netis: nx30v2: name, LEDs and netconsole fixes X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=c982357;p=thirdparty%2Fopenwrt.git mediatek: netis: nx30v2: name, LEDs and netconsole fixes 1. Add 'model' to the DTS for netis NX30V2 and define WiFi LED. 2. Clean up device alternative model definitions by removing unused aliases. 3. Update uboot config for nx30v2 to enable netconsole. 4. Fix typo. Signed-off-by: Zhiwei Cao --- 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 7567b2009b7..c411bd909b2 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 NX30V2"; + compatible = "mediatek,mt7981", "mediatek,mt7981-rfb"; + chosen { + stdout-path = &uart0; @@ -163,7 +163,7 @@ +}; --- /dev/null +++ b/configs/mt7981_netis_nx30v2_defconfig -@@ -0,0 +1,157 @@ +@@ -0,0 +1,125 @@ +CONFIG_ARM=y +CONFIG_SYS_HAS_NONCACHED_MEMORY=y +CONFIG_POSITION_INDEPENDENT=y @@ -172,119 +172,92 @@ +CONFIG_SYS_MALLOC_F_LEN=0x4000 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_DEFAULT_DEVICE_TREE="mt7981-netis-nx30v2" ++CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_TARGET_MT7981=y ++CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART_BASE=0x11002000 +CONFIG_DEBUG_UART_CLOCK=40000000 -+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_DEBUG_UART=y -+CONFIG_OF_LIBFDT_OVERLAY=y -+CONFIG_SMBIOS_PRODUCT_NAME="" -+CONFIG_CFB_CONSOLE_ANSI=y -+CONFIG_BOARD_LATE_INIT=y +CONFIG_BUTTON_CMD=y -+CONFIG_BUTTON=y -+CONFIG_BUTTON_GPIO=y -+CONFIG_GPIO_HOG=y -+CONFIG_CMD_ENV_FLAGS=y +CONFIG_FIT=y -+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y -+CONFIG_LED=y -+CONFIG_LED_BLINK=y -+CONFIG_LED_SW_BLINK=y -+CONFIG_LED_GPIO=y +CONFIG_SPI_BOOT=y -+CONFIG_BOOTSTD_DEFAULTS=y -+CONFIG_BOOTSTD_FULL=y ++CONFIG_AUTOBOOT_MENU_SHOW=y ++CONFIG_OF_SYSTEM_SETUP=y +CONFIG_USE_PREBOOT=y +CONFIG_SYS_CBSIZE=512 +CONFIG_SYS_PBSIZE=1049 -+CONFIG_AUTOBOOT_MENU_SHOW=y +CONFIG_LOGLEVEL=7 ++CONFIG_CONSOLE_MUX=y +CONFIG_LOG=y +# CONFIG_BOARD_INIT is not set ++CONFIG_BOARD_LATE_INIT=y ++CONFIG_UPDATE_FIT=y ++CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="MT7981> " ++CONFIG_CMD_CPU=y ++CONFIG_CMD_LICENSE=y +# CONFIG_BOOTM_NETBSD is not set +# CONFIG_BOOTM_PLAN9 is not set +# CONFIG_BOOTM_RTEMS is not set +# CONFIG_BOOTM_VXWORKS is not set ++CONFIG_CMD_BOOTMENU=y ++CONFIG_CMD_ASKENV=y ++CONFIG_CMD_ERASEENV=y ++CONFIG_CMD_ENV_FLAGS=y ++CONFIG_CMD_STRINGS=y +# CONFIG_CMD_UNLZ4 is not set +# CONFIG_CMD_UNZIP is not set -+CONFIG_CMD_BOOTMENU=y -+CONFIG_CMD_BOOTP=y -+CONFIG_CMD_BUTTON=y -+CONFIG_CMD_CACHE=y -+CONFIG_CMD_CDP=y -+CONFIG_CMD_CPU=y -+CONFIG_CMD_DHCP=y +CONFIG_CMD_DFU=y +CONFIG_CMD_DM=y -+CONFIG_CMD_ELF=y -+CONFIG_CMD_DNS=y -+CONFIG_CMD_ECHO=y -+CONFIG_CMD_ENV_READMEM=y -+CONFIG_CMD_ERASEENV=y -+CONFIG_CMD_FDT=y -+CONFIG_CMD_FS_GENERIC=y -+CONFIG_CMD_FS_UUID=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_MTD=y -+CONFIG_CMD_HASH=y -+CONFIG_CMD_ITEST=y -+CONFIG_CMD_LED=y -+CONFIG_CMD_LICENSE=y -+CONFIG_CMD_LINK_LOCAL=y -+CONFIG_CMD_MTD=y -+CONFIG_CMD_NAND=y -+# CONFIG_MTD_RAW_NAND is not set -+CONFIG_CMD_NAND_TRIMFFS=y +CONFIG_CMD_PCI=y -+CONFIG_CMD_PSTORE=y -+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 -+CONFIG_CMD_PING=y -+CONFIG_CMD_PXE=y -+CONFIG_CMD_SF=y +CONFIG_CMD_SF_TEST=y -+CONFIG_CMD_SMC=y -+CONFIG_CMD_UBI=y -+CONFIG_CMD_UBI_RENAME=y -+CONFIG_CMD_UBIFS=y -+CONFIG_CMD_TFTPBOOT=y +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_TFTPSRV=y -+CONFIG_CMD_ASKENV=y +CONFIG_CMD_RARP=y -+CONFIG_CMD_SETEXPR=y -+CONFIG_CMD_SLEEP=y ++CONFIG_CMD_CDP=y ++CONFIG_CMD_LINK_LOCAL=y ++CONFIG_CMD_DHCP=y ++CONFIG_CMD_DNS=y ++CONFIG_CMD_PING=y +CONFIG_CMD_SNTP=y -+CONFIG_CMD_SOURCE=y -+CONFIG_CMD_STRINGS=y ++CONFIG_CMD_PXE=y ++CONFIG_CMD_CACHE=y ++CONFIG_CMD_PSTORE=y ++CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000 +CONFIG_CMD_UUID=y ++CONFIG_CMD_HASH=y ++CONFIG_CMD_SMC=y ++CONFIG_CMD_FS_GENERIC=y ++CONFIG_CMD_FS_UUID=y ++CONFIG_CMD_UBI=y ++CONFIG_CMD_UBI_RENAME=y +CONFIG_ENV_OVERWRITE=y +CONFIG_ENV_IS_IN_UBI=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y +CONFIG_ENV_UBI_PART="ubi" -+CONFIG_ENV_SIZE=0x1f000 -+CONFIG_ENV_SIZE_REDUND=0x1f000 +CONFIG_ENV_UBI_VOLUME="ubootenv" -+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" +CONFIG_ENV_UBI_VOLUME_CREATE=y -+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_ENV_USE_DEFAULT_ENV_TEXT_FILE=y +CONFIG_ENV_DEFAULT_ENV_TEXT_FILE="defenvs/netis_nx30v2.env" -+CONFIG_NET_RANDOM_ETHADDR=y ++CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_NETCONSOLE=y +CONFIG_USE_IPADDR=y +CONFIG_IPADDR="192.168.1.1" +CONFIG_USE_SERVERIP=y +CONFIG_SERVERIP="192.168.1.254" -+CONFIG_REGEX=y ++CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_REGMAP=y +CONFIG_SYSCON=y ++CONFIG_BUTTON=y ++CONFIG_BUTTON_GPIO=y +CONFIG_CLK=y ++CONFIG_GPIO_HOG=y ++CONFIG_LED=y ++CONFIG_LED_BLINK=y ++CONFIG_LED_SW_BLINK=y ++CONFIG_LED_GPIO=y +# CONFIG_MMC is not set -+CONFIG_HUSH_PARSER=y -+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y -+CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_MTD=y +CONFIG_DM_MTD=y +CONFIG_MTD_SPI_NAND=y @@ -309,18 +282,13 @@ +CONFIG_MTK_POWER_DOMAIN=y +CONFIG_DM_SERIAL=y +CONFIG_SERIAL_RX_BUFFER=y -+CONFIG_SERIAL_RX_BUFFER_SIZE=256 +CONFIG_MTK_SERIAL=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_MTK_SPIM=y +CONFIG_HEXDUMP=y -+# CONFIG_EFI_LOADER is not set -+CONFIG_LMB_MAX_REGIONS=64 -+CONFIG_OF_SYSTEM_SETUP=y -+CONFIG_UPDATE_COMMON=y -+CONFIG_UPDATE_FIT=y -+CONFIG_CONSOLE_MUX=y ++# CONFIG_TOOLS_LIBCRYPTO is not set ++# CONFIG_TOOLS_KWBIMAGE is not set --- /dev/null +++ b/defenvs/netis_nx30v2.env @@ -0,0 +1,64 @@ @@ -381,10 +349,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..55075b419ed 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 NX30V2"; 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 58f3873f9b8..4752122aea1 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -2270,16 +2270,14 @@ endef TARGET_DEVICES += netgear_wax220 define Device/netis_nx30v2 - DEVICE_VENDOR := Netis + DEVICE_VENDOR := netis DEVICE_MODEL := NX30V2 DEVICE_ALT0_VENDOR := Netcore DEVICE_ALT0_MODEL := POWER30AX - DEVICE_ALT1_VENDOR := Netcore - DEVICE_ALT1_MODEL := N30PRO - DEVICE_ALT2_VENDOR := GWBN - DEVICE_ALT2_MODEL := GW3001 - DEVICE_ALT3_VENDOR := GLC - DEVICE_ALT3_MODEL := W7 + DEVICE_ALT1_VENDOR := GWBN + DEVICE_ALT1_MODEL := GW3001 + DEVICE_ALT2_VENDOR := GLC + DEVICE_ALT2_MODEL := W7 DEVICE_DTS := mt7981b-netis-nx30v2 DEVICE_DTS_DIR := ../dts DEVICE_DTC_FLAGS := --pad 4096