From fe43f9b2f251118c2ae68a635087dad9afa5fd8d Mon Sep 17 00:00:00 2001 From: Yuzhii0718 Date: Sun, 1 Mar 2026 21:51:14 +0800 Subject: [PATCH] mt7986: add support for ruijie_rg-x60-new --- defconfig/mt7986-ax6000.config | 4 + package/base-files/files/bin/config_generate | 19 +- package/boot/uboot-envtools/files/mediatek | 1 + package/mtk/applications/mtk-smp/files/smp.sh | 1 + .../mt7986a-ruijie-rg-x60-new-common.dtsi | 252 ++++++++++++++++++ .../mt7986a-ruijie-rg-x60-new-stock.dts | 64 +++++ .../mediatek/mt7986a-ruijie-rg-x60-new.dts | 64 +++++ target/linux/mediatek/image/mt7986.mk | 36 +++ .../mt7986/base-files/etc/board.d/02_network | 2 + .../mt7986/base-files/lib/upgrade/platform.sh | 2 + 10 files changed, 444 insertions(+), 1 deletion(-) create mode 100644 target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-new-common.dtsi create mode 100644 target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-new-stock.dts create mode 100644 target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-new.dts diff --git a/defconfig/mt7986-ax6000.config b/defconfig/mt7986-ax6000.config index cdae3c021c..a50d7b9223 100644 --- a/defconfig/mt7986-ax6000.config +++ b/defconfig/mt7986-ax6000.config @@ -9,6 +9,10 @@ CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_ruijie-rg-x60-pro=y CONFIG_TARGET_DEVICE_PACKAGES_mediatek_mt7986_DEVICE_ruijie-rg-x60-pro="" CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_ruijie-rg-x60-pro-stock=y CONFIG_TARGET_DEVICE_PACKAGES_mediatek_mt7986_DEVICE_ruijie-rg-x60-pro-stock="" +CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_ruijie-rg-x60-new=y +CONFIG_TARGET_DEVICE_PACKAGES_mediatek_mt7986_DEVICE_ruijie-rg-x60-new="" +CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_ruijie-rg-x60-new-stock=y +CONFIG_TARGET_DEVICE_PACKAGES_mediatek_mt7986_DEVICE_ruijie-rg-x60-new-stock="" CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_tplink_tl-xdr6086=y CONFIG_TARGET_DEVICE_PACKAGES_mediatek_mt7986_DEVICE_tplink_tl-xdr6086="" CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_tplink_tl-xdr6088=y diff --git a/package/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate index a2d967a83f..ffa6b17db6 100755 --- a/package/base-files/files/bin/config_generate +++ b/package/base-files/files/bin/config_generate @@ -3,6 +3,7 @@ CFG=/etc/board.json . /usr/share/libubox/jshn.sh +. /lib/functions/system.sh [ -s $CFG ] || /bin/board_detect || exit 1 [ -s /etc/config/network -a -s /etc/config/system ] && exit 0 @@ -90,6 +91,10 @@ generate_static_network() { } addr_offset=2 +get_board_name() { + [ -f /tmp/sysinfo/board_name ] && cat /tmp/sysinfo/board_name +} + generate_network() { local ports device macaddr protocol type ipaddr netmask vlan local bridge=$2 @@ -161,8 +166,20 @@ generate_network() { case "$protocol" in static) local ipad + local board + board="$(get_board_name)" case "$1" in - lan) ipad=${ipaddr:-"192.168.1.1"} ;; + lan) + case "$board" in + ruijie,rg-x60-new*|\ + ruijie,rg-x60-pro*) + ipad=${ipaddr:-"192.168.110.1"} + ;; + *) + ipad=${ipaddr:-"192.168.6.1"} + ;; + esac + ;; *) ipad=${ipaddr:-"192.168.$((addr_offset++)).1"} ;; esac diff --git a/package/boot/uboot-envtools/files/mediatek b/package/boot/uboot-envtools/files/mediatek index 4afeb4926f..ea218efe34 100644 --- a/package/boot/uboot-envtools/files/mediatek +++ b/package/boot/uboot-envtools/files/mediatek @@ -31,6 +31,7 @@ livinet,zr-3020*) ;; h3c,nx30pro |\ *clt,r30b1* |\ +ruijie,rg-x60-new* |\ ruijie,rg-x60-pro* |\ cmcc,xr30 |\ cmcc,rax3000m) diff --git a/package/mtk/applications/mtk-smp/files/smp.sh b/package/mtk/applications/mtk-smp/files/smp.sh index 0f394c50e9..eef25a105f 100755 --- a/package/mtk/applications/mtk-smp/files/smp.sh +++ b/package/mtk/applications/mtk-smp/files/smp.sh @@ -737,6 +737,7 @@ setup_model() bananapi,bpi-r3mini* |\ netcore,n60 |\ glinet,gl-mt6000|\ + ruijie,rg-x60-new* |\ ruijie,rg-x60-pro* |\ jdcloud,re-cp-03 |\ tplink,tl-xdr608* |\ diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-new-common.dtsi b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-new-common.dtsi new file mode 100644 index 0000000000..7f3d3e1bcc --- /dev/null +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-new-common.dtsi @@ -0,0 +1,252 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) + +/dts-v1/; +#include +#include +#include + +#include "mt7986a.dtsi" +#include "mt7986a-pinctrl.dtsi" + +/ { + aliases { + led-boot = &led_status_red; + led-failsafe = &led_status_red; + led-running = &led_status_green; + led-upgrade = &led_status_blue; + }; + + chosen { + bootargs = "console=ttyS0,115200n1 loglevel=8 earlycon=uart8250,mmio32,0x11002000"; + }; + + memory { + reg = <0 0x40000000 0 0x20000000>; + }; + + gpio-keys { + compatible = "gpio-keys"; + + button-reset { + label = "reset"; + linux,code = ; + gpios = <&pio 14 GPIO_ACTIVE_LOW>; + }; + + button-mesh { + label = "mesh"; + linux,code = ; + gpios = <&pio 15 GPIO_ACTIVE_LOW>; + }; + }; + + leds { + compatible = "gpio-leds"; + + led_status_red: led-0 { + label = "red:status"; + gpios = <&pio 10 GPIO_ACTIVE_LOW>; + }; + + led_status_green: led-1 { + label = "green:status"; + gpios = <&pio 9 GPIO_ACTIVE_LOW>; + }; + + led_status_blue: led-2 { + label = "blue:status"; + gpios = <&pio 11 GPIO_ACTIVE_LOW>; + }; + + mesh_led: led-3 { + label = "mesh:status"; + gpios = <&pio 22 GPIO_ACTIVE_LOW>; + }; + }; +}; + +ð { + status = "okay"; + + gmac0: mac@0 { + compatible = "mediatek,eth-mac"; + reg = <0>; + phy-mode = "2500base-x"; + + fixed-link { + speed = <2500>; + full-duplex; + pause; + }; + }; + + gmac1: mac@1 { + compatible = "mediatek,eth-mac"; + reg = <1>; + phy-mode = "2500base-x"; + phy-handle = <&phy15>; + }; + + mdio: mdio-bus { + #address-cells = <1>; + #size-cells = <0>; + + phy15: phy@f { + compatible = "ethernet-phy-id03a2.a411", "ethernet-phy-ieee802.3-c45"; + reg = <15>; + reset-gpios = <&pio 6 GPIO_ACTIVE_LOW>; + reset-assert-us = <10000>; + reset-deassert-us = <20000>; + }; + }; +}; + +&mdio { + switch: switch@1f { + compatible = "mediatek,mt7531"; + reg = <31>; + reset-gpios = <&pio 5 GPIO_ACTIVE_HIGH>; + interrupt-controller; + #interrupt-cells = <1>; + interrupt-parent = <&pio>; + interrupts = <66 IRQ_TYPE_LEVEL_HIGH>; + }; +}; + +&pio { + spi_flash_pins: spi-flash-pins-33-to-38 { + mux { + function = "spi"; + groups = "spi0", "spi0_wp_hold"; + }; + conf-pu { + pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP"; + drive-strength = <8>; + mediatek,pull-up-adv = <0>; /* bias-disable */ + }; + conf-pd { + pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO"; + drive-strength = <8>; + mediatek,pull-down-adv = <0>; /* bias-disable */ + }; + }; + + wf_2g_5g_pins: wf_2g_5g-pins { + mux { + function = "wifi"; + groups = "wf_2g", "wf_5g"; + }; + conf { + pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4", + "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6", + "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10", + "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1", + "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0", + "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8", + "WF1_TOP_CLK", "WF1_TOP_DATA"; + drive-strength = <4>; + }; + }; + + wf_dbdc_pins: wf_dbdc-pins { + mux { + function = "wifi"; + groups = "wf_dbdc"; + }; + conf { + pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4", + "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6", + "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10", + "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1", + "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0", + "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8", + "WF1_TOP_CLK", "WF1_TOP_DATA"; + drive-strength = ; + }; + }; +}; + +&hnat { + mtketh-wan = "eth1"; + mtketh-lan = "lan"; + mtketh-max-gmac = <2>; + status = "okay"; +}; + +&spi0 { + pinctrl-names = "default"; + pinctrl-0 = <&spi_flash_pins>; + cs-gpios = <0>, <0>; + status = "okay"; + + spi_nand: spi_nand@1 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "spi-nand"; + reg = <1>; + spi-max-frequency = <52000000>; + spi-tx-bus-width = <4>; + spi-rx-bus-width = <4>; + spi-cal-enable; + spi-cal-mode = "read-data"; + spi-cal-datalen = <7>; + spi-cal-data = /bits/ 8 <0x53 0x50 0x49 0x4E 0x41 0x4E 0x44>; /* 'SPINAND' */ + spi-cal-addrlen = <5>; + spi-cal-addr = /bits/ 32 <0x0 0x0 0x0 0x0 0x0>; + }; +}; + +&switch { + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + label = "lan0"; + }; + + port@1 { + reg = <1>; + label = "lan1"; + }; + + port@2 { + reg = <2>; + label = "lan2"; + }; + + port@3 { + reg = <3>; + label = "lan3"; + }; + + port@6 { + reg = <6>; + label = "cpu"; + ethernet = <&gmac0>; + phy-mode = "2500base-x"; + + fixed-link { + speed = <2500>; + full-duplex; + pause; + }; + }; + }; +}; + +&wbsys { + status = "okay"; + pinctrl-names = "default", "dbdc"; + pinctrl-0 = <&wf_2g_5g_pins>; + pinctrl-1 = <&wf_dbdc_pins>; +}; + +&uart0 { + status = "okay"; +}; + +&watchdog { + status = "okay"; +}; diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-new-stock.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-new-stock.dts new file mode 100644 index 0000000000..6a28f9c81f --- /dev/null +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-new-stock.dts @@ -0,0 +1,64 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) + +/dts-v1/; +#include "mt7986a-ruijie-rg-x60-new-common.dtsi" + +/ { + compatible = "ruijie,rg-x60-new-stock", "mediatek,mt7986a"; + model = "Ruijie RG-X60 New (Stock)"; + + nmbm_spim_nand { + compatible = "generic,nmbm"; + #address-cells = <1>; + #size-cells = <1>; + + lower-mtd-device = <&spi_nand>; + forced-create; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <0x01>; + #size-cells = <0x01>; + + partition@0 { + label = "BL2"; + reg = <0x000000 0x100000>; + read-only; + }; + + partition@100000 { + label = "u-boot-env"; + reg = <0x100000 0x80000>; + read-only; + }; + + partition@180000 { + label = "Factory"; + reg = <0x180000 0x200000>; + read-only; + }; + + partition@380000 { + label = "FIP"; + reg = <0x380000 0x200000>; + }; + + partition@580000 { + label = "product_info"; + reg = <0x580000 0x80000>; + read-only; + }; + + partition@600000 { + label = "kdump"; + reg = <0x600000 0x80000>; + read-only; + }; + + partition@680000 { + label = "ubi"; + reg = <0x680000 0x3f00000>; + }; + }; + }; +}; \ No newline at end of file diff --git a/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-new.dts b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-new.dts new file mode 100644 index 0000000000..3691d06ec4 --- /dev/null +++ b/target/linux/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7986a-ruijie-rg-x60-new.dts @@ -0,0 +1,64 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) + +/dts-v1/; +#include "mt7986a-ruijie-rg-x60-new-common.dtsi" + +/ { + compatible = "ruijie,rg-x60-new", "mediatek,mt7986a"; + model = "Ruijie RG-X60 New"; + + nmbm_spim_nand { + compatible = "generic,nmbm"; + #address-cells = <1>; + #size-cells = <1>; + + lower-mtd-device = <&spi_nand>; + forced-create; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <0x01>; + #size-cells = <0x01>; + + partition@0 { + label = "BL2"; + reg = <0x000000 0x100000>; + read-only; + }; + + partition@100000 { + label = "u-boot-env"; + reg = <0x100000 0x80000>; + read-only; + }; + + partition@180000 { + label = "Factory"; + reg = <0x180000 0x200000>; + read-only; + }; + + partition@380000 { + label = "FIP"; + reg = <0x380000 0x200000>; + }; + + partition@580000 { + label = "product_info"; + reg = <0x580000 0x80000>; + read-only; + }; + + partition@600000 { + label = "kdump"; + reg = <0x600000 0x80000>; + read-only; + }; + + partition@680000 { + label = "ubi"; + reg = <0x680000 0x6b00000>; + }; + }; + }; +}; \ No newline at end of file diff --git a/target/linux/mediatek/image/mt7986.mk b/target/linux/mediatek/image/mt7986.mk index 4971822279..b93fea9785 100644 --- a/target/linux/mediatek/image/mt7986.mk +++ b/target/linux/mediatek/image/mt7986.mk @@ -510,6 +510,42 @@ define Device/ruijie-rg-x60-pro endef TARGET_DEVICES += ruijie-rg-x60-pro +define Device/ruijie-rg-x60-new-stock + DEVICE_VENDOR := Ruijie + DEVICE_MODEL := Ruijie RG-X60 New (Stock) + DEVICE_DTS := mt7986a-ruijie-rg-x60-new-stock + DEVICE_DTS_DIR := $(DTS_DIR)/mediatek + DEVICE_PACKAGES := kmod-phy-airoha-en8811h + SUPPORTED_DEVICES := ruijie,rg-x60-new-stock + UBINIZE_OPTS := -E 5 + BLOCKSIZE := 128k + PAGESIZE := 2048 + IMAGE_SIZE := 64512k + KERNEL_IN_UBI := 1 + IMAGES += factory.bin + IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata +endef +TARGET_DEVICES += ruijie-rg-x60-new-stock + +define Device/ruijie-rg-x60-new + DEVICE_VENDOR := Ruijie + DEVICE_MODEL := Ruijie RG-X60 New + DEVICE_DTS := mt7986a-ruijie-rg-x60-new + DEVICE_DTS_DIR := $(DTS_DIR)/mediatek + DEVICE_PACKAGES := kmod-phy-airoha-en8811h + SUPPORTED_DEVICES := ruijie,rg-x60-new + UBINIZE_OPTS := -E 5 + BLOCKSIZE := 128k + PAGESIZE := 2048 + IMAGE_SIZE := 109568k + KERNEL_IN_UBI := 1 + IMAGES += factory.bin + IMAGE/factory.bin := append-ubi | check-size $$$$(IMAGE_SIZE) + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata +endef +TARGET_DEVICES += ruijie-rg-x60-new + define Device/tplink_tl-common DEVICE_VENDOR := TP-Link DEVICE_DTS_DIR := $(DTS_DIR)/mediatek diff --git a/target/linux/mediatek/mt7986/base-files/etc/board.d/02_network b/target/linux/mediatek/mt7986/base-files/etc/board.d/02_network index b3add346a2..c03b518f51 100755 --- a/target/linux/mediatek/mt7986/base-files/etc/board.d/02_network +++ b/target/linux/mediatek/mt7986/base-files/etc/board.d/02_network @@ -33,6 +33,7 @@ mediatek_setup_interfaces() ucidef_set_interfaces_lan_wan "eth0" "eth1" ;; netcore,n60 |\ + ruijie,rg-x60-new* |\ ruijie,rg-x60-pro*) ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" eth1 ;; @@ -73,6 +74,7 @@ mediatek_setup_macs() wan_mac=$label_mac lan_mac=$(macaddr_add "$label_mac" 2) ;; + ruijie,rg-x60-new* |\ ruijie,rg-x60-pro*) label_mac=$(mtd_get_mac_ascii product_info ethaddr) wan_mac=$label_mac diff --git a/target/linux/mediatek/mt7986/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/mt7986/base-files/lib/upgrade/platform.sh index 7d1c2ff438..d355999e81 100755 --- a/target/linux/mediatek/mt7986/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/mt7986/base-files/lib/upgrade/platform.sh @@ -148,6 +148,7 @@ platform_do_upgrade() { xiaomi,redmi-router-ax6000 |\ bananapi,bpi-r3mini |\ netcore,n60 |\ + ruijie,rg-x60-new* |\ ruijie,rg-x60-pro* |\ tplink,tl-xdr608* |\ zyxel,ex5700 |\ @@ -180,6 +181,7 @@ platform_check_image() { xiaomi,redmi-router-ax6000* |\ bananapi,bpi-r3mini* |\ netcore,n60 |\ + ruijie,rg-x60-new* |\ ruijie,rg-x60-pro* |\ *snand* |\ glinet,gl-mt6000 |\