mediatek: fix ubi size for zbtlink zbt z8102ax v2
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled

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: c908fc7d95 ("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>
(cherry picked from commit d2fa070f70)
[rebased upon 24.10 branch]
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
Link: https://github.com/openwrt/openwrt/pull/21085
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Tianling Shen 2025-11-13 21:41:30 +08:00 committed by Robert Marko
parent 0ed59099ee
commit 9fa8e7e9a3
3 changed files with 10 additions and 7 deletions

View file

@ -38,7 +38,7 @@
linux,code = <KEY_WPS_BUTTON>;
gpios = <&pio 0 GPIO_ACTIVE_LOW>;
};
};
leds {
@ -55,20 +55,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>;
@ -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>;
};
};
};

View file

@ -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

View file

@ -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