diff options
| author | Tianling Shen | 2025-11-13 13:41:30 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2025-11-20 22:26:29 +0000 |
| commit | d2fa070f7014e8b1144a23e343b31390e7f565ff (patch) | |
| tree | e662a479de4c2c56c25f9fdbda2ed1a6c9e357e6 | |
| parent | 2cc8d3e382c0b8b919cef2e9f1cfec9ec7954150 (diff) | |
| download | openwrt-d2fa070f7014e8b1144a23e343b31390e7f565ff.tar.gz | |
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 <cnsztl@immortalwrt.org>
Link: https://github.com/openwrt/openwrt/pull/20769
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
3 files changed, 11 insertions, 10 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 64058b3985..c3947ea6d9 100644 --- a/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts +++ b/target/linux/mediatek/dts/mt7981b-zbtlink-zbt-z8102ax-v2.dts @@ -39,7 +39,7 @@ linux,code = <KEY_WPS_BUTTON>; gpios = <&pio 0 GPIO_ACTIVE_LOW>; }; - + }; leds { @@ -56,20 +56,20 @@ color = <LED_COLOR_ID_GREEN>; function = LED_FUNCTION_STATUS; }; - + led_status_blue: blue { gpios = <&pio 11 GPIO_ACTIVE_LOW>; color = <LED_COLOR_ID_BLUE>; function = LED_FUNCTION_STATUS; }; - + led_status_5g1: 5g1 { gpios = <&pio 8 GPIO_ACTIVE_LOW>; color = <LED_COLOR_ID_BLUE>; function = LED_FUNCTION_USB; function-enumerator = <0>; }; - + led_status_5g2: 5g2 { gpios = <&pio 13 GPIO_ACTIVE_LOW>; color = <LED_COLOR_ID_BLUE>; @@ -136,7 +136,7 @@ pause; }; }; - + gmac1: mac@1 { compatible = "mediatek,eth-mac"; reg = <1>; @@ -208,7 +208,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 a1ee81cf0a..20691f56e2 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,12 +8,11 @@ case "$(board_name)" in bananapi,bpi-r3) ucidef_set_compat_version "1.3" ;; - routerich,ax3000) - ucidef_set_compat_version "1.1" - ;; bananapi,bpi-r4|\ bananapi,bpi-r4-2g5|\ - bananapi,bpi-r4-poe) + bananapi,bpi-r4-poe|\ + 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 3026b0a23f..35ded0b826 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -2689,6 +2689,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 |