From 9fa8e7e9a3a98282fac09880b014e980e476796d Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 13 Nov 2025 21:41:30 +0800 Subject: [PATCH] mediatek: fix ubi size for zbtlink zbt z8102ax v2 According to the factory uboot and firmware[1], the ubi size is set to 512 MiB (0x20000000) and it exceeds the size of the flash, after that the uboot and kernel resizes it to 114.5 MiB (0x7280000) instead of 114.125 MiB (0x7220000). The mismatch of the ubi size causes kernel fails to read ubi volumes and throws panic. Trim whitespaces while at it. 1. https://github.com/immortalwrt/immortalwrt/issues/2123#issuecomment-3523744128 Fixes: c908fc7d9591 ("mediatek: add support for Zbtlink ZBT-Z8102AX v2") Signed-off-by: Tianling Shen Link: https://github.com/openwrt/openwrt/pull/20769 Signed-off-by: Hauke Mehrtens (cherry picked from commit d2fa070f7014e8b1144a23e343b31390e7f565ff) [rebased upon 24.10 branch] Signed-off-by: Tianling Shen Link: https://github.com/openwrt/openwrt/pull/21085 Signed-off-by: Robert Marko --- .../mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts | 12 ++++++------ .../filogic/base-files/etc/board.d/05_compat-version | 3 ++- target/linux/mediatek/image/filogic.mk | 2 ++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts index 08fc4b977a1..f96be223551 100644 --- a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts +++ b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts @@ -38,7 +38,7 @@ linux,code = ; gpios = <&pio 0 GPIO_ACTIVE_LOW>; }; - + }; leds { @@ -55,20 +55,20 @@ color = ; function = LED_FUNCTION_STATUS; }; - + led_status_blue: blue { gpios = <&pio 11 GPIO_ACTIVE_LOW>; color = ; function = LED_FUNCTION_STATUS; }; - + led_status_5g1: 5g1 { gpios = <&pio 8 GPIO_ACTIVE_LOW>; color = ; function = LED_FUNCTION_USB; function-enumerator = <0>; }; - + led_status_5g2: 5g2 { gpios = <&pio 13 GPIO_ACTIVE_LOW>; color = ; @@ -135,7 +135,7 @@ pause; }; }; - + gmac1: mac@1 { compatible = "mediatek,eth-mac"; reg = <1>; @@ -207,7 +207,7 @@ nand_rootfs: partition@580000 { label = "ubi"; - reg = <0x0580000 0x7220000>; + reg = <0x0580000 0x7280000>; }; }; }; diff --git a/target/linux/mediatek/filogic/base-files/etc/board.d/05_compat-version b/target/linux/mediatek/filogic/base-files/etc/board.d/05_compat-version index 9b704b983cb..74591b7b0fa 100644 --- a/target/linux/mediatek/filogic/base-files/etc/board.d/05_compat-version +++ b/target/linux/mediatek/filogic/base-files/etc/board.d/05_compat-version @@ -8,7 +8,8 @@ case "$(board_name)" in bananapi,bpi-r3) ucidef_set_compat_version "1.2" ;; - routerich,ax3000) + routerich,ax3000|\ + zbtlink,zbt-z8102ax-v2) ucidef_set_compat_version "1.1" ;; esac diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 78e77ea28d5..da2a01b51c1 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -2096,6 +2096,8 @@ define Device/zbtlink_zbt-z8102ax-v2 IMAGES += factory.bin IMAGE/factory.bin := append-ubi | check-size $$(IMAGE_SIZE) IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata + DEVICE_COMPAT_VERSION := 1.1 + DEVICE_COMPAT_MESSAGE := Partition layout has been changed to fit the bootloader endef TARGET_DEVICES += zbtlink_zbt-z8102ax-v2 -- 2.47.3