[openwrt/openwrt] mediatek: Routerich AX3000: add OpenWrt U-Boot layout
LEDE Commits
lede-commits at lists.infradead.org
Thu Nov 28 10:58:51 PST 2024
ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/c312295b5682295915109300c953c277d3fd420c
commit c312295b5682295915109300c953c277d3fd420c
Author: Mikhail Zhilkin <csharper2005 at gmail.com>
AuthorDate: Sat Oct 26 09:37:14 2024 +0000
mediatek: Routerich AX3000: add OpenWrt U-Boot layout
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 at gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16791
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
(cherry picked from commit d413163832df93c321eef3fce8c4f72c350d5308)
Link: https://github.com/openwrt/openwrt/pull/17097
Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
package/boot/uboot-envtools/files/mediatek_filogic | 1 +
...00.dts => mt7981b-routerich-ax3000-common.dtsi} | 23 +---
.../dts/mt7981b-routerich-ax3000-ubootmod.dts | 52 +++++++++
.../mediatek/dts/mt7981b-routerich-ax3000.dts | 119 +++------------------
.../filogic/base-files/etc/board.d/01_leds | 3 +-
.../filogic/base-files/etc/board.d/02_network | 3 +-
.../etc/hotplug.d/ieee80211/11_fix_wifi_mac | 1 +
.../filogic/base-files/lib/upgrade/platform.sh | 1 +
target/linux/mediatek/image/filogic.mk | 25 +++++
9 files changed, 101 insertions(+), 127 deletions(-)
diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic
index b637f43287..58db7dad28 100644
--- a/package/boot/uboot-envtools/files/mediatek_filogic
+++ b/package/boot/uboot-envtools/files/mediatek_filogic
@@ -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.dts b/target/linux/mediatek/dts/mt7981b-routerich-ax3000-common.dtsi
similarity index 93%
copy from target/linux/mediatek/dts/mt7981b-routerich-ax3000.dts
copy to target/linux/mediatek/dts/mt7981b-routerich-ax3000-common.dtsi
index aa6a15ee1d..f0b0b9365b 100644
--- a/target/linux/mediatek/dts/mt7981b-routerich-ax3000.dts
+++ b/target/linux/mediatek/dts/mt7981b-routerich-ax3000-common.dtsi
@@ -8,9 +8,6 @@
#include "mt7981.dtsi"
/ {
- model = "Routerich AX3000";
- compatible = "routerich,ax3000", "mediatek,mt7981";
-
aliases {
label-mac-device = &wan;
@@ -22,7 +19,7 @@
serial0 = &uart0;
};
- chosen {
+ chosen: chosen {
stdout-path = "serial0:115200n8";
};
@@ -153,7 +150,7 @@
status = "okay";
/* ESMT F50L1G41LB (128M) */
- spi_nand at 0 {
+ spi: spi_nand at 0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "spi-nand";
@@ -170,11 +167,7 @@
spi-cal-addrlen = <5>;
spi-cal-addr = /bits/ 32 <0x0 0x0 0x0 0x0 0x0>;
- mediatek,nmbm;
- mediatek,bmt-max-ratio = <1>;
- mediatek,bmt-max-reserved-blocks = <64>;
-
- partitions {
+ partitions: partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
@@ -191,11 +184,6 @@
read-only;
};
- partition at 100000 {
- label = "u-boot-env";
- reg = <0x100000 0x80000>;
- };
-
partition at 180000 {
label = "Factory";
reg = <0x180000 0x200000>;
@@ -223,11 +211,6 @@
reg = <0x380000 0x200000>;
read-only;
};
-
- partition at 580000 {
- label = "ubi";
- reg = <0x580000 0x7000000>;
- };
};
};
};
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
index 0000000000..dfdb78936d
--- /dev/null
+++ b/target/linux/mediatek/dts/mt7981b-routerich-ax3000-ubootmod.dts
@@ -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 at 100000 {
+ label = "u-boot-env-orig";
+ reg = <0x100000 0x80000>;
+ read-only;
+ };
+
+ partition at 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";
+ };
+};
diff --git a/target/linux/mediatek/dts/mt7981b-routerich-ax3000.dts b/target/linux/mediatek/dts/mt7981b-routerich-ax3000.dts
index aa6a15ee1d..c0a10b3fc8 100644
--- a/target/linux/mediatek/dts/mt7981b-routerich-ax3000.dts
+++ b/target/linux/mediatek/dts/mt7981b-routerich-ax3000.dts
@@ -1,118 +1,27 @@
// 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 at 100000 {
+ label = "u-boot-env";
+ reg = <0x100000 0x80000>;
};
- memory {
- reg = <0 0x40000000 0 0x10000000>;
+ partition at 580000 {
+ label = "ubi";
+ reg = <0x580000 0x7000000>;
};
};
diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
index dad5c293de..38c4b7525b 100644
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/01_leds
@@ -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"
diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
index 7bfc61a269..1480dbcbc7 100644
--- a/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/filogic/base-files/etc/board.d/02_network
@@ -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|\
diff --git a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
index 7402bfc71b..5e83a167de 100644
--- a/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
+++ b/target/linux/mediatek/filogic/base-files/etc/hotplug.d/ieee80211/11_fix_wifi_mac
@@ -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|\
diff --git a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
index ce334b2c8e..0040ffbb26 100755
--- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh
@@ -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|\
diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk
index f366a9b920..672790f1a7 100644
--- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk
@@ -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
More information about the lede-commits
mailing list