mediatek: Routerich AX3000: add OpenWrt U-Boot layout
authorMikhail Zhilkin <csharper2005@gmail.com>
Sat, 26 Oct 2024 09:37:14 +0000 (09:37 +0000)
committerPetr Štetiar <ynezz@true.cz>
Thu, 28 Nov 2024 18:49:33 +0000 (18:49 +0000)
This commit adds OpenWrt U-Boot layout support for Routerich AX3000. The
aims:
1. Get open-source U-Boot;
2. Get maximum available free space in OpenWrt.

Install
-------
1. Copy OpenWrt ubootmod-bl31-uboot.fip, ubootmod-preloader.bin, to the
   /tmp folder of the router using scp.

2. Make mtd partitions backups:
   http://192.168.1.1/cgi-bin/luci/admin/system/flash -> Save mtdblock
   contents

3. Install kmod-mtd-rw:
```
opkg update && opkg install kmod-mtd-rw
```

4. Write FIP and preloader:
```
insmod mtd-rw i_want_a_brick=1
mtd unlock BL2
mtd erase BL2
mtd write /tmp/ubootmod-preloader.bin BL2
mtd unlock FIP
mtd erase FIP
mtd write /tmp/ubootmod-bl31-uboot.fip FIP
```

5. Copy OpenWrt ubootmod-initramfs-recovery.itb to the tftp server root
   with IP 192.168.1.254.

6. Reboot router:
```
reboot
```
U-Boot will automatically download from the tftp server and boot OpenWrt
initramfs system.

7. Copy OpenWrt ubootmod-squashfs-sysupgrade.itb to the /tmp dir of the
   router using scp.

8. Run sysupgrade:
```
sysupgrade -n /tmp/squashfs-sysupgrade.itb
```

Recovery
--------
1. Place OpenWrt initramfs-recovery.itb image (with original name) on the
   tftp server (IP: 192.168.1.254).
2. Press "reset" button and power on the router. After ~10 sec release the
   button.
3. Use OpenWrt initramfs system for recovery.

BL2 and FIP recovery
--------------------
Use mtk_uartboot and UART connection if BL2 or FIP in UBI is destroyed:
Link: https://github.com/981213/mtk_uartboot
Return to stock:
----------------
1. Copy partition backups (BL2.bin and FIP.bin) to the /tmp dir of the
   router using scp.

2. Install kmod-mtd-rw:
```
opkg update && opkg install kmod-mtd-rw
```

3. Restore stock U-Boot and reboot:
```
insmod mtd-rw i_want_a_brick=1
mtd unlock BL2
mtd erase BL2
mtd write /tmp/BL2.bin BL2
mtd unlock FIP
mtd erase FIP
mtd write /tmp/FIP.bin FIP
reboot
```

4. Open U-Boot web recovery, upload stock firmware image and start
   upgrade.
Link: http://192.168.1.1
Signed-off-by: Mikhail Zhilkin <csharper2005@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16791
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit d413163832df93c321eef3fce8c4f72c350d5308)
Link: https://github.com/openwrt/openwrt/pull/17097
Signed-off-by: Petr Štetiar <ynezz@true.cz>
package/boot/uboot-envtools/files/mediatek_filogic
target/linux/mediatek/dts/mt7981b-routerich-ax3000-common.dtsi [new file with mode: 0644]
target/linux/mediatek/dts/mt7981b-routerich-ax3000-ubootmod.dts [new file with mode: 0644]
target/linux/mediatek/dts/mt7981b-routerich-ax3000.dts
target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
target/linux/mediatek/filogic/base-files/etc/board.d/02_network
target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
target/linux/mediatek/image/filogic.mk

index b637f4328778a1bf69859db701a608c3a32c6f0c..58db7dad281c0c6f5ded7a196c3c8113c32d1262 100644 (file)
@@ -39,6 +39,7 @@ jcg,q30-pro|\
 netcore,n60|\
 nokia,ea0326gmp|\
 qihoo,360t7|\
+routerich,ax3000-ubootmod|\
 tplink,tl-xdr4288|\
 tplink,tl-xdr6086|\
 tplink,tl-xdr6088|\
diff --git a/target/linux/mediatek/dts/mt7981b-routerich-ax3000-common.dtsi b/target/linux/mediatek/dts/mt7981b-routerich-ax3000-common.dtsi
new file mode 100644 (file)
index 0000000..f0b0b93
--- /dev/null
@@ -0,0 +1,302 @@
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
+
+/dts-v1/;
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+
+#include "mt7981.dtsi"
+
+/ {
+       aliases {
+               label-mac-device = &wan;
+
+               led-boot = &led_power_blue;
+               led-failsafe = &led_power_blue;
+               led-running = &led_power_blue;
+               led-upgrade = &led_power_blue;
+
+               serial0 = &uart0;
+       };
+
+       chosen: chosen {
+               stdout-path = "serial0:115200n8";
+       };
+
+       gpio-keys {
+               compatible = "gpio-keys";
+
+               button-0 {
+                       label = "mesh";
+                       linux,input-type = <EV_SW>;
+                       linux,code = <BTN_0>;
+                       gpios = <&pio 0 GPIO_ACTIVE_LOW>;
+                       debounce-interval = <60>;
+               };
+
+               button-1 {
+                       label = "reset";
+                       gpios = <&pio 1 GPIO_ACTIVE_LOW>;
+                       linux,code = <KEY_RESTART>;
+                       debounce-interval = <60>;
+               };
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               led-0 {
+                       color = <LED_COLOR_ID_RED>;
+                       function = LED_FUNCTION_WLAN;
+                       function-enumerator = <50>;
+                       gpios = <&pio 5 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "phy1tpt";
+               };
+
+               led-1 {
+                       color = <LED_COLOR_ID_RED>;
+                       function = LED_FUNCTION_WAN;
+                       gpios = <&pio 6 GPIO_ACTIVE_HIGH>;
+               };
+
+               led_power_blue: led-2 {
+                       color = <LED_COLOR_ID_BLUE>;
+                       function = LED_FUNCTION_POWER;
+                       gpios = <&pio 7 GPIO_ACTIVE_LOW>;
+               };
+
+               led-3 {
+                       color = <LED_COLOR_ID_BLUE>;
+                       function = LED_FUNCTION_LAN;
+                       function-enumerator = <1>;
+                       gpios = <&pio 9 GPIO_ACTIVE_LOW>;
+               };
+
+               led-4 {
+                       color = <LED_COLOR_ID_BLUE>;
+                       function = LED_FUNCTION_LAN;
+                       function-enumerator = <2>;
+                       gpios = <&pio 10 GPIO_ACTIVE_LOW>;
+               };
+
+               led-5 {
+                       color = <LED_COLOR_ID_BLUE>;
+                       function = LED_FUNCTION_LAN;
+                       function-enumerator = <3>;
+                       gpios = <&pio 11 GPIO_ACTIVE_LOW>;
+               };
+
+               led-6 {
+                       color = <LED_COLOR_ID_BLUE>;
+                       function = LED_FUNCTION_WAN;
+                       gpios = <&pio 12 GPIO_ACTIVE_LOW>;
+               };
+
+               led-7 {
+                       color = <LED_COLOR_ID_BLUE>;
+                       function = LED_FUNCTION_WLAN;
+                       function-enumerator = <24>;
+                       gpios = <&pio 34 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "phy0tpt";
+               };
+
+               led-8 {
+                       color = <LED_COLOR_ID_BLUE>;
+                       /* LED_FUNCTION_MESH isn't implemented yet */
+                       function = "mesh";
+                       gpios = <&pio 35 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+       memory {
+               reg = <0 0x40000000 0 0x10000000>;
+       };
+};
+
+&eth {
+       status = "okay";
+
+       gmac0: mac@0 {
+               compatible = "mediatek,eth-mac";
+               reg = <0>;
+               phy-mode = "2500base-x";
+
+               nvmem-cell-names = "mac-address";
+               nvmem-cells = <&macaddr_factory_4 (-1)>;
+
+               fixed-link {
+                       speed = <2500>;
+                       full-duplex;
+                       pause;
+               };
+       };
+};
+
+&mdio_bus {
+       switch: switch@1f {
+               compatible = "mediatek,mt7531";
+               reg = <0x1f>;
+               reset-gpios = <&pio 39 GPIO_ACTIVE_HIGH>;
+               interrupt-controller;
+               #interrupt-cells = <1>;
+               interrupt-parent = <&pio>;
+               interrupts = <38 IRQ_TYPE_LEVEL_HIGH>;
+       };
+};
+
+&spi0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&spi0_flash_pins>;
+       status = "okay";
+
+       /* ESMT F50L1G41LB (128M) */
+       spi: spi_nand@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "spi-nand";
+               reg = <0>;
+
+               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>;
+               spi-cal-addrlen = <5>;
+               spi-cal-addr = /bits/ 32 <0x0 0x0 0x0 0x0 0x0>;
+
+               partitions: partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0_all {
+                               label = "spi0.0";
+                               reg = <0x0 0x8000000>;
+                               read-only;
+                       };
+
+                       partition@0 {
+                               label = "BL2";
+                               reg = <0x0 0x100000>;
+                               read-only;
+                       };
+
+                       partition@180000 {
+                               label = "Factory";
+                               reg = <0x180000 0x200000>;
+                               read-only;
+
+                               nvmem-layout {
+                                       compatible = "fixed-layout";
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+
+                                       eeprom_factory_0: eeprom@0 {
+                                               reg = <0x0 0x1000>;
+                                       };
+
+                                       macaddr_factory_4: macaddr@4 {
+                                               compatible = "mac-base";
+                                               reg = <0x4 0x6>;
+                                               #nvmem-cell-cells = <1>;
+                                       };
+                               };
+                       };
+
+                       partition@380000 {
+                               label = "FIP";
+                               reg = <0x380000 0x200000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&switch {
+       ports {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               port@0 {
+                       reg = <0>;
+                       label = "lan1";
+               };
+
+               port@2 {
+                       reg = <2>;
+                       label = "lan2";
+               };
+
+               port@3 {
+                       reg = <3>;
+                       label = "lan3";
+               };
+
+               wan: port@4 {
+                       reg = <4>;
+                       label = "wan";
+
+                       nvmem-cell-names = "mac-address";
+                       nvmem-cells = <&macaddr_factory_4 (-2)>;
+               };
+
+               port@6 {
+                       reg = <6>;
+                       ethernet = <&gmac0>;
+                       phy-mode = "2500base-x";
+
+                       fixed-link {
+                               speed = <2500>;
+                               full-duplex;
+                               pause;
+                       };
+               };
+       };
+};
+
+&pio {
+       spi0_flash_pins: spi0-pins {
+               mux {
+                       function = "spi";
+                       groups = "spi0", "spi0_wp_hold";
+               };
+
+               conf-pu {
+                       pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
+                       drive-strength = <MTK_DRIVE_8mA>;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_11>;
+               };
+
+               conf-pd {
+                       pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
+                       drive-strength = <MTK_DRIVE_8mA>;
+                       bias-pull-down = <MTK_PUPD_SET_R1R0_11>;
+               };
+       };
+};
+
+&uart0 {
+       status = "okay";
+};
+
+&usb_phy {
+       status = "okay";
+};
+
+&watchdog {
+       status = "okay";
+};
+
+&wifi {
+       status = "okay";
+       nvmem-cell-names = "eeprom";
+       nvmem-cells = <&eeprom_factory_0>;
+};
+
+&xhci {
+       status = "okay";
+       mediatek,u3p-dis-msk = <0x1>;
+};
diff --git a/target/linux/mediatek/dts/mt7981b-routerich-ax3000-ubootmod.dts b/target/linux/mediatek/dts/mt7981b-routerich-ax3000-ubootmod.dts
new file mode 100644 (file)
index 0000000..dfdb789
--- /dev/null
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: GPL-2.0-only OR MIT
+
+#include "mt7981b-routerich-ax3000-common.dtsi"
+
+/ {
+       model = "Routerich AX3000 (OpenWrt U-Boot layout)";
+       compatible = "routerich,ax3000-ubootmod", "mediatek,mt7981";
+};
+
+&chosen {
+       rootdisk = <&ubi_fit_volume>;
+};
+
+&partitions {
+       partition@100000 {
+               label = "u-boot-env-orig";
+               reg = <0x100000 0x80000>;
+               read-only;
+       };
+
+       partition@580000 {
+               label = "ubi";
+               reg = <0x580000 0x7a80000>;
+               compatible = "linux,ubi";
+
+               volumes {
+                       ubi_fit_volume: ubi-volume-fit {
+                               volname = "fit";
+                       };
+
+                       ubi_ubootenv: ubi-volume-ubootenv {
+                               volname = "ubootenv";
+                       };
+
+                       ubi_ubootenv2: ubi-volume-ubootenv2 {
+                               volname = "ubootenv2";
+                       };
+               };
+       };
+};
+
+&ubi_ubootenv {
+       nvmem-layout {
+               compatible = "u-boot,env-redundant-bool";
+       };
+};
+
+&ubi_ubootenv2 {
+       nvmem-layout {
+               compatible = "u-boot,env-redundant-bool";
+       };
+};
index aa6a15ee1d120992e5d9a5b6e5d8c07add945c4f..c0a10b3fc86bb08ad97759fbd2c4b7d317ac6d5d 100644 (file)
 // SPDX-License-Identifier: GPL-2.0-only OR MIT
 
-/dts-v1/;
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/leds/common.h>
-
-#include "mt7981.dtsi"
+#include "mt7981b-routerich-ax3000-common.dtsi"
 
 / {
        model = "Routerich AX3000";
        compatible = "routerich,ax3000", "mediatek,mt7981";
+};
 
-       aliases {
-               label-mac-device = &wan;
-
-               led-boot = &led_power_blue;
-               led-failsafe = &led_power_blue;
-               led-running = &led_power_blue;
-               led-upgrade = &led_power_blue;
-
-               serial0 = &uart0;
-       };
-
-       chosen {
-               stdout-path = "serial0:115200n8";
-       };
-
-       gpio-keys {
-               compatible = "gpio-keys";
-
-               button-0 {
-                       label = "mesh";
-                       linux,input-type = <EV_SW>;
-                       linux,code = <BTN_0>;
-                       gpios = <&pio 0 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-
-               button-1 {
-                       label = "reset";
-                       gpios = <&pio 1 GPIO_ACTIVE_LOW>;
-                       linux,code = <KEY_RESTART>;
-                       debounce-interval = <60>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               led-0 {
-                       color = <LED_COLOR_ID_RED>;
-                       function = LED_FUNCTION_WLAN;
-                       function-enumerator = <50>;
-                       gpios = <&pio 5 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy1tpt";
-               };
-
-               led-1 {
-                       color = <LED_COLOR_ID_RED>;
-                       function = LED_FUNCTION_WAN;
-                       gpios = <&pio 6 GPIO_ACTIVE_HIGH>;
-               };
-
-               led_power_blue: led-2 {
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_POWER;
-                       gpios = <&pio 7 GPIO_ACTIVE_LOW>;
-               };
-
-               led-3 {
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_LAN;
-                       function-enumerator = <1>;
-                       gpios = <&pio 9 GPIO_ACTIVE_LOW>;
-               };
-
-               led-4 {
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_LAN;
-                       function-enumerator = <2>;
-                       gpios = <&pio 10 GPIO_ACTIVE_LOW>;
-               };
-
-               led-5 {
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_LAN;
-                       function-enumerator = <3>;
-                       gpios = <&pio 11 GPIO_ACTIVE_LOW>;
-               };
-
-               led-6 {
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_WAN;
-                       gpios = <&pio 12 GPIO_ACTIVE_LOW>;
-               };
-
-               led-7 {
-                       color = <LED_COLOR_ID_BLUE>;
-                       function = LED_FUNCTION_WLAN;
-                       function-enumerator = <24>;
-                       gpios = <&pio 34 GPIO_ACTIVE_LOW>;
-                       linux,default-trigger = "phy0tpt";
-               };
+&spi {
+       mediatek,nmbm;
+       mediatek,bmt-max-ratio = <1>;
+       mediatek,bmt-max-reserved-blocks = <64>;
+};
 
-               led-8 {
-                       color = <LED_COLOR_ID_BLUE>;
-                       /* LED_FUNCTION_MESH isn't implemented yet */
-                       function = "mesh";
-                       gpios = <&pio 35 GPIO_ACTIVE_LOW>;
-               };
+&partitions {
+       partition@100000 {
+               label = "u-boot-env";
+               reg = <0x100000 0x80000>;
        };
 
-       memory {
-               reg = <0 0x40000000 0 0x10000000>;
+       partition@580000 {
+               label = "ubi";
+               reg = <0x580000 0x7000000>;
        };
 };
 
index dad5c293dec3779e6fa1aff5bb0d28465d806367..38c4b7525b60e75d941bdde6980a6caf5ac5e2b2 100644 (file)
@@ -75,7 +75,8 @@ openwrt,one)
        ucidef_set_led_netdev "lanact" "LANACT" "green:lan" "eth1" "rx tx"
        ucidef_set_led_netdev "lanlink" "LANLINK" "amber:lan" "eth1" "link"
        ;;
-routerich,ax3000)
+routerich,ax3000|\
+routerich,ax3000-ubootmod)
        ucidef_set_led_netdev "lan-1" "lan-1" "blue:lan-1" "lan1" "link tx rx"
        ucidef_set_led_netdev "lan-2" "lan-2" "blue:lan-2" "lan2" "link tx rx"
        ucidef_set_led_netdev "lan-3" "lan-3" "blue:lan-3" "lan3" "link tx rx"
index 7bfc61a26902a26905d702aeb97b03d44a5acf53..1480dbcbc78c23e65c318f66eb0e0b2a687cbd0c 100644 (file)
@@ -34,7 +34,8 @@ mediatek_setup_interfaces()
        cudy,wr3000-v1|\
        jcg,q30-pro|\
        qihoo,360t7|\
-       routerich,ax3000)
+       routerich,ax3000|\
+       routerich,ax3000-ubootmod)
                ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" wan
                ;;
        asus,tuf-ax4200|\
index 7402bfc71babb8bb672cfa45d023ce44646943ce..5e83a167de970417da58a1739a56e368c255f8d8 100644 (file)
@@ -158,6 +158,7 @@ case "$board" in
                [ "$PHYNBR" = "1" ] && macaddr_add $addr 1 > /sys${DEVPATH}/macaddress
                ;;
        routerich,ax3000|\
+       routerich,ax3000-ubootmod|\
        zbtlink,zbt-z8102ax|\
        zbtlink,zbt-z8103ax|\
        zyxel,ex5601-t0|\
index ce334b2c8eecbb8f4eef9f92f20be238289add3b..0040ffbb266627eb7edee43b133de15e918e024d 100755 (executable)
@@ -80,6 +80,7 @@ platform_do_upgrade() {
        openwrt,one|\
        netcore,n60|\
        qihoo,360t7|\
+       routerich,ax3000-ubootmod|\
        tplink,tl-xdr4288|\
        tplink,tl-xdr6086|\
        tplink,tl-xdr6088|\
index f366a9b9202a7c1d1934fd146e9376c7767774fe..672790f1a776986c3e6efd53b7becd588431310d 100644 (file)
@@ -1228,6 +1228,31 @@ define Device/routerich_ax3000
 endef
 TARGET_DEVICES += routerich_ax3000
 
+define Device/routerich_ax3000-ubootmod
+  DEVICE_VENDOR := Routerich
+  DEVICE_MODEL := AX3000 (OpenWrt U-Boot layout)
+  DEVICE_DTS := mt7981b-routerich-ax3000-ubootmod
+  DEVICE_DTS_DIR := ../dts
+  UBINIZE_OPTS := -E 5
+  BLOCKSIZE := 128k
+  PAGESIZE := 2048
+  KERNEL_IN_UBI := 1
+  UBOOTENV_IN_UBI := 1
+  IMAGES := sysupgrade.itb
+  KERNEL_INITRAMFS_SUFFIX := -recovery.itb
+  KERNEL := kernel-bin | gzip
+  KERNEL_INITRAMFS := kernel-bin | lzma | \
+       fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb with-initrd | pad-to 64k
+  IMAGE/sysupgrade.itb := append-kernel | \
+       fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \
+       append-metadata
+  DEVICE_PACKAGES := kmod-mt7915e kmod-mt7981-firmware kmod-usb3 mt7981-wo-firmware
+  ARTIFACTS := preloader.bin bl31-uboot.fip
+  ARTIFACT/preloader.bin := mt7981-bl2 spim-nand-ddr3
+  ARTIFACT/bl31-uboot.fip := mt7981-bl31-uboot routerich_ax3000
+endef
+TARGET_DEVICES += routerich_ax3000-ubootmod
+
 define Device/ruijie_rg-x60-pro
   DEVICE_VENDOR := Ruijie
   DEVICE_MODEL := RG-X60 Pro