From c6319de48b193651a6103f8b079e80267bbc98a2 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 28 Feb 2024 09:52:08 +0100 Subject: [PATCH] mediatek: re-enable mt7622-rfb1-ubi with changed partition layout The boot loader does not have a fixed size limit for the kernel, so we're free to change the layout. This may break sysupgrade, but a fresh flash from initramfs works. Fixes: 6e2962d4c548 ("mediatek: mt7622: skip build for MT7622 rfb1 (UBI)") Signed-off-by: Felix Fietkau --- target/linux/mediatek/dts/mt7622-rfb1-ubi.dts | 4 ++-- target/linux/mediatek/image/mt7622.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/linux/mediatek/dts/mt7622-rfb1-ubi.dts b/target/linux/mediatek/dts/mt7622-rfb1-ubi.dts index 0f6d9bbc50..721695227a 100644 --- a/target/linux/mediatek/dts/mt7622-rfb1-ubi.dts +++ b/target/linux/mediatek/dts/mt7622-rfb1-ubi.dts @@ -44,12 +44,12 @@ partition@200000 { label = "kernel"; - reg = <0x2c0000 0x400000>; + reg = <0x2c0000 0x600000>; }; partition@6c0000 { label = "ubi"; - reg = <0x6c0000 0x6f00000>; + reg = <0x8c0000 0x6f00000>; }; /delete-node/ partition@2200000; diff --git a/target/linux/mediatek/image/mt7622.mk b/target/linux/mediatek/image/mt7622.mk index 2b39d1849c..f06175041e 100644 --- a/target/linux/mediatek/image/mt7622.mk +++ b/target/linux/mediatek/image/mt7622.mk @@ -295,14 +295,14 @@ define Device/mediatek_mt7622-rfb1-ubi UBINIZE_OPTS := -E 5 BLOCKSIZE := 128k PAGESIZE := 2048 - KERNEL_SIZE := 4194304 + KERNEL_SIZE := 6291456 IMAGE_SIZE := 32768k IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | \ check-size $$$$(IMAGE_SIZE) IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef -# TARGET_DEVICES += mediatek_mt7622-rfb1-ubi +TARGET_DEVICES += mediatek_mt7622-rfb1-ubi define Device/netgear_wax206 $(Device/dsa-migration) -- 2.30.2