U-Boot payload for 6.0 has grown larger than MTD partition

[dancrossnyc]

In the 6.0 release, visionfive2_fw_payload.img is now 3.07MiB (3221077 bytes). Unfortunately, on my machine, the size of the uboot mtd partition is not quite big enough to accommodate this:

# cat /proc/mtd
dev:    size   erasesize  name
mtd0: 00040000 00001000 "spl"
mtd1: 00010000 00001000 "uboot-env"
mtd2: 00300000 00001000 "uboot"
mtd3: 00100000 00001000 "data"
#

Note that the "uboot" partition, mtd2 is 0x30_0000 bytes long, or 3MiB; not quite large enough for the FW payload. "data" appears to be unused; I'm guessing the solution here is to combine them in the dts?

[dancrossnyc]

Hi, just checking in on this: is there any advice for addressing the size issue?

[dancrossnyc]

Ping?

[hal-feng]

I guess you are using the JH7110_VisionFive2_devel branch of which the kernel version is 5.15.
To solve this issue, you can increase the size of uboot mtd partition in arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi. For example,

&qspi {
            ...
            uboot@100000 {
                reg = <0x100000 0x400000>;
            };
            ...
};

This issue does not exist in JH7110_VisionFive2_6.6.y_devel branch and JH7110_VisionFive2_6.12.y_devel branch. The qspi flash partitions are not consistent among these three branches now. I will sync them later.