Skip to content

Commit

Permalink
mediatek: re-enable mt7622-rfb1-ubi with changed partition layout
Browse files Browse the repository at this point in the history
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: 6e2962d ("mediatek: mt7622: skip build for MT7622 rfb1 (UBI)")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
nbd168 committed Feb 28, 2024
1 parent d6e008a commit c6319de
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions target/linux/mediatek/dts/mt7622-rfb1-ubi.dts
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@

partition@200000 {
label = "kernel";
reg = <0x2c0000 0x400000>;
reg = <0x2c0000 0x600000>;
};

partition@6c0000 {

This comment has been minimized.

Copy link
@musashino205

musashino205 Feb 28, 2024

Contributor

@nbd168 This address in node name also needs to be updated.
And shoudn't COMPAT_VERSION be bumped?

label = "ubi";
reg = <0x6c0000 0x6f00000>;
reg = <0x8c0000 0x6f00000>;
};

/delete-node/ partition@2200000;
Expand Down
4 changes: 2 additions & 2 deletions target/linux/mediatek/image/mt7622.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

1 comment on commit c6319de

@danpawlik
Copy link

@danpawlik danpawlik commented on c6319de Feb 28, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nbd168 can be done similar patch for AX6s to revert dadad6b ?

Please sign in to comment.