update

devices/mediatek_mt7981/patches/depends.patch

@@ -1,6 +1,11 @@
 --- a/target/linux/mediatek/image/mt7981.mk
 +++ b/target/linux/mediatek/image/mt7981.mk
-@@ -194,6 +194,7 @@ define Device/mt7981-360-t7-108M
+@@ -190,10 +190,11 @@ endef
+ TARGET_DEVICES += mt7981-360-t7
+ 
+ define Device/mt7981-360-t7-108M
+-  DEVICE_VENDOR := MediaTek
++  DEVICE_VENDOR := Qihoo
    DEVICE_MODEL := 360 T7 (with 108M ubi)
    DEVICE_DTS := mt7981-360-t7-108M
    DEVICE_DTS_DIR := $(DTS_DIR)/mediatek

devices/ramips_mt7621/.config

@@ -49,5 +49,8 @@ CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_linksys_ea7300-v2=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_linksys_ea6350-v4=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_linksys_e5600=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_jdcloud_luban=y
+CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_h3c_tx1800-plus=y
+CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_h3c_tx1801-plus=y
+CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_h3c_tx1806=y
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务

devices/ramips_mt7621/patches/TX1800.patch

@@ -0,0 +1,432 @@
+From 13308161788c98ae6cd48c22b13339fdb8c77130 Mon Sep 17 00:00:00 2001
+From: Shiji Yang <[email protected]>
+Date: Sun, 20 Mar 2022 23:42:37 +0800
+Subject: [PATCH] ramips: add support for H3C TX1800 Plus / TX1801 Plus /
+ TX1806
+
+H3C TX180x series WiFi6 routers are customized by different carrier.
+While these three devices look different, they use the same motherboard
+inside. Another minor difference comes from the model name definition
+in the u-boot environment variable.
+
+Specifications:
+ SOC:      MT7621 + MT7915
+ ROM:      128 MiB
+ RAM:      256 MiB
+ LED:      status *2
+ Button:   reset *1 + wps/mesh *1
+ Ethernet:        lan *3 + wan *1 (10/100/1000Mbps)
+ TTL Baudrate:    115200
+ TFTP server IP:  192.168.124.99
+
+MAC Address:
+ use        address(sample 1)   address(sample 2)    source
+ label      88:xx:xx:98:xx:12   88:xx:xx:a2:xx:a5   u-boot-env@ethaddr
+ lan        88:xx:xx:98:xx:13   88:xx:xx:a2:xx:a6   $label +1
+ wan        88:xx:xx:98:xx:12   88:xx:xx:a2:xx:a5   $label
+ WiFi4_2G   8a:xx:xx:58:xx:14   8a:xx:xx:52:xx:a7   (Compatibility mode)
+ WiFi5_5G   8a:xx:xx:b8:xx:14   8a:xx:xx:b2:xx:a7   (Compatibility mode)
+ WiFi6_2G   8a:xx:xx:18:xx:14   8a:xx:xx:12:xx:a7
+ WiFi6_5G   8a:xx:xx:78:xx:14   8a:xx:xx:72:xx:a7
+
+Compatibility mode is used to guarantee the connection of old devices
+that only support WiFi4 or WiFi5.
+
+TFTP + TTL Installation:
+Although a TTL connection is required for installation, we do not need
+to tear down it. We can find the TTL port from the cooling hole at the
+bottom. It is located below LAN3 and the pins are defined as follows:
+|LAN1|LAN2|LAN3|----|WAN|
+--------------------
+    |GND|TX|RX|VCC|
+
+1. Set tftp server IP to 192.168.124.99 and put initramfs firmware in
+   server's root directory, rename it to a simple name "initramfs.bin".
+2. Plug in the power supply and wait for power on, connect the TTL cable
+   and open a TTL session, enter "reboot", then enter "Y" to confirm.
+   Finally push "0" to interruput boot while booting.
+3. Execute command to install a initramfs system:
+   # tftp 0x80010000 192.168.124.99:initramfs.bin
+   # bootm 0x80010000
+4. Backup nand flash by OpenWrt LuCI or dd instruction. We need those
+   partitions if we want to back to stock firmwre due to official
+   website does not provide download link.
+   # dd if=/dev/mtd1 of=/tmp/u-boot-env.bin
+   # dd if=/dev/mtd4 of=/tmp/firmware.bin
+5. Edit u-boot env to ensure use default bootargs and first image slot:
+   # fw_setenv bootargs
+   # fw_setenv bootflag 0
+6. Upgrade sysupgrade firmware.
+7. About restore stock firmware: flash the "firmware" and "u-boot-env"
+   partitions that we backed up in step 4.
+   # mtd write /tmp/u-boot-env.bin u-boot-env
+   # mtd write /tmp/firmware.bin firmware
+
+Additional Info:
+The H3C stock firmware has a 160-byte firmware header that appears to
+use a non-standard CRC32 verification algorithm. For this part of the
+data, the u-boot does not check it so we can just directly replace it
+with a placeholder.
+
+Signed-off-by: Shiji Yang <[email protected]>
+---
+ package/boot/uboot-envtools/files/ramips      |   9 +-
+ .../ramips/dts/mt7621_h3c_tx1800-plus.dts     |   8 +
+ .../ramips/dts/mt7621_h3c_tx1801-plus.dts     |   8 +
+ target/linux/ramips/dts/mt7621_h3c_tx1806.dts |   8 +
+ .../linux/ramips/dts/mt7621_h3c_tx180x.dtsi   | 165 ++++++++++++++++++
+ target/linux/ramips/image/mt7621.mk           |  40 +++++
+ .../mt7621/base-files/etc/board.d/02_network  |  10 ++
+ .../etc/hotplug.d/ieee80211/10_fix_wifi_mac   |   7 +
+ .../mt7621/base-files/lib/upgrade/platform.sh |   3 +
+ 9 files changed, 255 insertions(+), 3 deletions(-)
+ create mode 100644 target/linux/ramips/dts/mt7621_h3c_tx1800-plus.dts
+ create mode 100644 target/linux/ramips/dts/mt7621_h3c_tx1801-plus.dts
+ create mode 100644 target/linux/ramips/dts/mt7621_h3c_tx1806.dts
+ create mode 100644 target/linux/ramips/dts/mt7621_h3c_tx180x.dtsi
+
+diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips
+index 7514bf65fb10e..738d983af2041 100644
+--- a/package/boot/uboot-envtools/files/ramips
++++ b/package/boot/uboot-envtools/files/ramips
+@@ -47,6 +47,9 @@ ravpower,rp-wd03)
+ 	[ -n "$idx" ] && \
+ 		ubootenv_add_uci_config "/dev/mtd$idx" "0x4000" "0x1000" "0x1000"
+ 	;;
++h3c,tx1800-plus|\
++h3c,tx1801-plus|\
++h3c,tx1806|\
+ jcg,q20|\
+ netgear,wax202)
+ 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000"
+diff --git a/target/linux/ramips/dts/mt7621_h3c_tx1800-plus.dts b/target/linux/ramips/dts/mt7621_h3c_tx1800-plus.dts
+new file mode 100644
+index 0000000000000..f763dd14dddf9
+--- /dev/null
++++ b/target/linux/ramips/dts/mt7621_h3c_tx1800-plus.dts
+@@ -0,0 +1,8 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++
++#include "mt7621_h3c_tx180x.dtsi"
++
++/ {
++	compatible = "h3c,tx1800-plus", "mediatek,mt7621-soc";
++	model = "H3C TX1800 Plus";
++};
+diff --git a/target/linux/ramips/dts/mt7621_h3c_tx1801-plus.dts b/target/linux/ramips/dts/mt7621_h3c_tx1801-plus.dts
+new file mode 100644
+index 0000000000000..4588b142c4fbb
+--- /dev/null
++++ b/target/linux/ramips/dts/mt7621_h3c_tx1801-plus.dts
+@@ -0,0 +1,8 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++
++#include "mt7621_h3c_tx180x.dtsi"
++
++/ {
++	compatible = "h3c,tx1801-plus", "mediatek,mt7621-soc";
++	model = "H3C TX1801 Plus";
++};
+diff --git a/target/linux/ramips/dts/mt7621_h3c_tx1806.dts b/target/linux/ramips/dts/mt7621_h3c_tx1806.dts
+new file mode 100644
+index 0000000000000..1e9b6456eec5c
+--- /dev/null
++++ b/target/linux/ramips/dts/mt7621_h3c_tx1806.dts
+@@ -0,0 +1,8 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++
++#include "mt7621_h3c_tx180x.dtsi"
++
++/ {
++	compatible = "h3c,tx1806", "mediatek,mt7621-soc";
++	model = "H3C TX1806";
++};
+diff --git a/target/linux/ramips/dts/mt7621_h3c_tx180x.dtsi b/target/linux/ramips/dts/mt7621_h3c_tx180x.dtsi
+new file mode 100644
+index 0000000000000..61f2f8cc98c01
+--- /dev/null
++++ b/target/linux/ramips/dts/mt7621_h3c_tx180x.dtsi
+@@ -0,0 +1,165 @@
++// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
++
++#include "mt7621.dtsi"
++
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++#include <dt-bindings/leds/common.h>
++
++/ {
++	aliases {
++		led-boot = &led_status_amber;
++		led-failsafe = &led_status_green;
++		led-running = &led_status_green;
++		led-upgrade = &led_status_amber;
++	};
++
++	chosen {
++		bootargs = "console=ttyS0,115200";
++	};
++
++	keys {
++		compatible = "gpio-keys";
++
++		reset {
++			label = "reset";
++			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_RESTART>;
++		};
++
++		wps {
++			label = "wps";
++			gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_WPS_BUTTON>;
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		led_status_amber: led-0 {
++			label = "amber:status";
++			color = <LED_COLOR_ID_AMBER>;
++			function = LED_FUNCTION_STATUS;
++			gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
++		};
++
++		led_status_green: led-1 {
++			label = "green:status";
++			color = <LED_COLOR_ID_GREEN>;
++			function = LED_FUNCTION_STATUS;
++			gpios = <&gpio 16 GPIO_ACTIVE_LOW>;
++		};
++	};
++};
++
++&gmac1 {
++	status = "okay";
++	label = "wan";
++	phy-handle = <&ethphy4>;
++};
++
++&mdio {
++	ethphy4: ethernet-phy@4 {
++		reg = <4>;
++	};
++};
++
++&nand {
++	status = "okay";
++
++	mediatek,nmbm;
++	mediatek,bmt-max-ratio = <1>;
++	mediatek,bmt-max-reserved-blocks = <64>;
++	mediatek,bmt-remap-range = <0x0000000 0x0a00000>;
++
++	partitions {
++		compatible = "fixed-partitions";
++		#address-cells = <1>;
++		#size-cells = <1>;
++
++		partition@0 {
++			label = "u-boot";
++			reg = <0x0000000 0x0080000>;
++			read-only;
++		};
++
++		partition@80000 {
++			label = "u-boot-env";
++			reg = <0x0080000 0x0080000>;
++		};
++
++		partition@100000 {
++			label = "exp";
++			reg = <0x0100000 0x0080000>;
++			read-only;
++		};
++
++		factory: partition@180000 {
++			label = "factory";
++			reg = <0x0180000 0x0080000>;
++			read-only;
++		};
++
++		partition@200000 {
++			label = "firmware";
++			reg = <0x0200000 0x7600000>;
++
++			compatible = "fixed-partitions";
++			#address-cells = <1>;
++			#size-cells = <1>;
++
++			partition@0 {
++				label = "kernel";
++				reg = <0x0000000 0x0800000>;
++			};
++
++			partition@800000 {
++				label = "ubi";
++				reg = <0x0800000 0x6e00000>;
++			};
++		};
++
++		/* last 8 MiB is reserved for NMBM bad block table */
++	};
++};
++
++&pcie {
++	status = "okay";
++};
++
++&pcie1 {
++	wifi@0,0 {
++		compatible = "mediatek,mt76";
++		reg = <0x0000 0 0 0 0>;
++		mediatek,mtd-eeprom = <&factory 0x0>;
++		mediatek,disable-radar-background;
++	};
++};
++
++&pcie2 {
++	status = "disabled";
++};
++
++&switch0 {
++	ports {
++		port@1 {
++			status = "okay";
++			label = "lan1";
++		};
++
++		port@2 {
++			status = "okay";
++			label = "lan2";
++		};
++
++		port@3 {
++			status = "okay";
++			label = "lan3";
++		};
++	};
++};
++
++&xhci {
++	status = "disabled";
++};
+diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
+index 34eac321127be..b560ce3d95b6a 100644
+--- a/target/linux/ramips/image/mt7621.mk
++++ b/target/linux/ramips/image/mt7621.mk
+@@ -31,6 +31,12 @@ define Build/gemtek-trailer
+ 	printf "%s%08X" ".GEMTEK." "$$(cksum $@ | cut -d ' ' -f1)" >> $@
+ endef
+ 
++define Build/h3c-blank-header
++	dd if=/dev/zero [email protected] bs=160 count=1
++	cat $@ >> [email protected]
++	mv [email protected] $@
++endef
++
+ define Build/iodata-factory
+ 	$(eval fw_size=$(word 1,$(1)))
+ 	$(eval fw_type=$(word 2,$(1)))
+@@ -752,6 +758,40 @@ define Device/gnubee_gb-pc2
+ endef
+ TARGET_DEVICES += gnubee_gb-pc2
+ 
++define Device/h3c_tx180x
++  $(Device/dsa-migration)
++  BLOCKSIZE := 128k
++  PAGESIZE := 2048
++  KERNEL_SIZE := 8192k
++  IMAGE_SIZE := 120832k
++  UBINIZE_OPTS := -E 5
++  KERNEL_LOADADDR := 0x82000000
++  KERNEL_INITRAMFS := kernel-bin | relocate-kernel 0x80001000 | lzma | \
++	fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
++  KERNEL := $$(KERNEL_INITRAMFS) | h3c-blank-header
++  IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
++  DEVICE_VENDOR := H3C
++  DEVICE_PACKAGES := kmod-mt7915e uboot-envtools
++endef
++
++define Device/h3c_tx1800-plus
++  $(Device/h3c_tx180x)
++  DEVICE_MODEL := TX1800 Plus
++endef
++TARGET_DEVICES += h3c_tx1800-plus
++
++define Device/h3c_tx1801-plus
++  $(Device/h3c_tx180x)
++  DEVICE_MODEL := TX1801 Plus
++endef
++TARGET_DEVICES += h3c_tx1801-plus
++
++define Device/h3c_tx1806
++  $(Device/h3c_tx180x)
++  DEVICE_MODEL := TX1806
++endef
++TARGET_DEVICES += h3c_tx1806
++
+ define Device/hilink_hlk-7621a-evb
+   $(Device/dsa-migration)
+   $(Device/uimage-lzma-loader)
+diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+index 320325f487e3f..400b03133ec82 100644
+--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
++++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+@@ -28,6 +28,9 @@ ramips_setup_interfaces()
+ 		;;
+ 	ampedwireless,ally-r1900k|\
+ 	gehua,ghl-r-001|\
++	h3c,tx1800-plus|\
++	h3c,tx1801-plus|\
++	h3c,tx1806|\
+ 	hiwifi,hc5962|\
+ 	netgear,wax202|\
+ 	xiaomi,mi-router-3-pro|\
+@@ -158,6 +161,13 @@ ramips_setup_macs()
+ 		wan_mac=$(mtd_get_mac_ascii u-boot-env wanaddr)
+ 		label_mac=$wan_mac
+ 		;;
++	h3c,tx1800-plus|\
++	h3c,tx1801-plus|\
++	h3c,tx1806)
++		label_mac=$(mtd_get_mac_ascii u-boot-env ethaddr)
++		lan_mac=$(macaddr_add "$label_mac" 1)
++		wan_mac=$label_mac
++		;;
+ 	hiwifi,hc5962)
+ 		lan_mac=$(mtd_get_mac_ascii bdinfo "Vfac_mac ")
+ 		label_mac=$lan_mac
+diff --git a/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac b/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
+index bced044234360..0ace1933e3f81 100644
+--- a/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
++++ b/target/linux/ramips/mt7621/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac
+@@ -37,6 +37,13 @@ case "$board" in
+ 		[ "$PHYNBR" = "1" ] && \
+ 			macaddr_add "$(mtd_get_mac_binary factory 0x4)" 1 > /sys${DEVPATH}/macaddress
+ 		;;
++	h3c,tx1800-plus|\
++	h3c,tx1801-plus|\
++	h3c,tx1806)
++		addr=$(macaddr_setbit $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) 2) 7)
++		[ "$PHYNBR" = "0" ] && echo -n ${addr:0:9}'1'${addr:10:7} > /sys${DEVPATH}/macaddress
++		[ "$PHYNBR" = "1" ] && echo -n ${addr:0:9}'7'${addr:10:7} > /sys${DEVPATH}/macaddress
++		;;
+ 	hiwifi,hc5962)
+ 		label_mac=$(mtd_get_mac_ascii bdinfo "Vfac_mac ")
+ 		[ "$PHYNBR" = "0" ] && [ -n "$label_mac" ] && \
+diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
+index 8a84130ab5bef..9af46202ba954 100755
+--- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
++++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
+@@ -60,6 +60,9 @@ platform_do_upgrade() {
+ 	dlink,dir-2640-a1|\
+ 	dlink,dir-2660-a1|\
+ 	dlink,dir-853-a3|\
++	h3c,tx1800-plus|\
++	h3c,tx1801-plus|\
++	h3c,tx1806|\
+ 	hiwifi,hc5962|\
+ 	iptime,a3004t|\
+ 	iptime,ax2004m|\