catspeed-cc/openwrt
2
1
Fork 0
Code Issues Pull Requests Activity

gemini: pad storlink reference firmware to 128kb

Browse Source 
The redboot partition parser gets upset if a partition
doesn't end on an even erase block and marks the partition
read-only.

Fix this by always padding the three firmware items to
128kb.

It is no longer required for the filesystem to be padded
to 6144kb, so we pad this to just 128kb like the kernel
images.

Link: https://github.com/openwrt/openwrt/pull/21750
(cherry picked from commit db7a2fb217)
Link: https://github.com/openwrt/openwrt/pull/21973
Signed-off-by: Linus Walleij <linusw@kernel.org>
This commit is contained in:
Linus Walleij 2026-01-25 21:01:47 +01:00
parent 26f776335a
commit 43547e9314
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/linux/gemini/image/Makefile
View File

@ -99,8 +99,10 @@ define CreateStorlinkTarfile
$(call Image/pad-to,$@.tmp/zImage,512)
# Copy first part of the kernel into zImage
dd if=$(IMAGE_KERNEL) of=$@.tmp/zImage bs=1 seek=512 count=$(3)
$(call Image/pad-to,$@.tmp/zImage,128k)
# Put the rest of the kernel into the "ramdisk"
dd if=$(IMAGE_KERNEL) of=$@.tmp/rd.gz bs=1 skip=$(3) count=6144k conv=sync
$(call Image/pad-to,$@.tmp/rd.gz,128k)
cp ./ImageInfo-$(1) $@.tmp/ImageInfo
sed -i -e "s/DATESTR/`date +%Y%m%d $(if $(SOURCE_DATE_EPOCH),--date "@$(SOURCE_DATE_EPOCH)")`/g" $@.tmp/ImageInfo
@ -200,9 +202,9 @@ define Device/storlink-reference
# 2096640 bytes zImage
# Ramdisk 6144k remaining zImage
# Application 6144k
IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 6144k | \
IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 128k | \
storlink-default-image $(1)
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 6144k | \
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | \
storlink-default-image $(1) | append-metadata
DEVICE_PACKAGES := $(GEMINI_NAS_PACKAGES)
endef
@ -225,9 +227,9 @@ define Device/raidsonic_ib-4220-b
# Kern 3072k - 512 | = 3145216
# Ramdisk 6144k | = 9216k
# Application 6144k | = 15360k
IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 6144k | \
IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to 128k | \
raidsonic-ib-4220-b-image $(1)
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 6144k | \
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | \
raidsonic-ib-4220-b-image $(1) | append-metadata
endef
TARGET_DEVICES += raidsonic_ib-4220-b