wic: Use --offset and --fixed-size instead of --align and --size
PATCH 1/1 wic: Use --offset and --fixed-size instead of --align and --size
The --align argument isn't intended to make a partition exist at a fixed location like the Rockchip boot ROM requires. Use the recently added --offset argument which will fail to build the image if the partition can't be placed at the correct location. Also used --fixed-size to make sure that Wic isn't inserting hidden padding that changes things around.
Finally, the location of the rootfs isn't required to be at sector 262144 since u-boot and the kernel reads the partition table to find it and actually hasn't been at this location anyway since Wic has been padding the /boot partition, so remove it's alignment requirements.
Signed-off-by Joshua Watt <[email protected]>
--- wic/firefly-rk3288.wks | 2 +- wic/rk3288-boot.wks | 14 +++++++------- wic/rk3399-boot.wks | 14 +++++++------- wic/rock-pi-4.wks | 2 +- wic/tinker-board.wks | 2 +- wic/vyasa-rk3288.wks | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-)
wic/firefly-rk3288.wks +1 -1
@@ -2,6 +2,6 @@ # Released under the MIT license (see COPYING.MIT for the terms) include rk3288-boot.wks -part / --align 131072 --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root +part / --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root bootloader --ptable gpt --append="console=tty1 console=ttyS2,115200n8 rw root=/dev/${RK_BOOT_DEVICE}p7 rootfstype=ext4 init=/sbin/init"
wic/rk3288-boot.wks +7 -7
@@ -12,13 +12,13 @@ # loader2 16384 8192 # atf 24576 8192 # boot 32768 229376 -# root 262144 - +# root 262144 - (suggested) # -part loader1 --align 32 --size 4000K --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=idbloader.img" -part reserved1 --align 4032 --size 64K --ondisk ${RK_BOOT_DEVICE} -part reserved2 --align 4096 --size 4096K --ondisk ${RK_BOOT_DEVICE} -part loader2 --align 8192 --size 4096K --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=u-boot.bin" -part atf --align 12288 --size 4096K --ondisk ${RK_BOOT_DEVICE} -part /boot --align 16384 --size=114688K --active --ondisk ${RK_BOOT_DEVICE} --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot" +part loader1 --offset 32 --fixed-size 4000K --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=idbloader.img" +part reserved1 --offset 4032 --fixed-size 64K --ondisk ${RK_BOOT_DEVICE} +part reserved2 --offset 4096 --fixed-size 4096K --ondisk ${RK_BOOT_DEVICE} +part loader2 --offset 8192 --fixed-size 4096K --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=u-boot.bin" +part atf --offset 12288 --fixed-size 4096K --ondisk ${RK_BOOT_DEVICE} +part /boot --offset 16384 --size 114688K --active --ondisk ${RK_BOOT_DEVICE} --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot"
wic/rk3399-boot.wks +7 -7
@@ -12,13 +12,13 @@ # loader2 16384 8192 # atf 24576 8192 # boot 32768 229376 -# root 262144 - +# root 262144 - (suggested) # -part loader1 --align 32 --size 4000K --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=idbloader.img" -part reserved1 --align 4032 --size 64K --ondisk ${RK_BOOT_DEVICE} -part reserved2 --align 4096 --size 4096K --ondisk ${RK_BOOT_DEVICE} -part loader2 --align 8192 --size 4096K --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=u-boot.itb" -part atf --align 12288 --size 4096K --ondisk ${RK_BOOT_DEVICE} -part /boot --align 16384 --size=114688K --active --ondisk ${RK_BOOT_DEVICE} --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot" +part loader1 --offset 32 --fixed-size 4000K --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=idbloader.img" +part reserved1 --offset 4032 --fixed-size 64K --ondisk ${RK_BOOT_DEVICE} +part reserved2 --offset 4096 --fixed-size 4096K --ondisk ${RK_BOOT_DEVICE} +part loader2 --offset 8192 --fixed-size 4096K --ondisk ${RK_BOOT_DEVICE} --source rawcopy --sourceparams="file=u-boot.itb" +part atf --offset 12288 --fixed-size 4096K --ondisk ${RK_BOOT_DEVICE} +part /boot --offset 16384 --size 114688K --active --ondisk ${RK_BOOT_DEVICE} --source bootimg-partition --fstype=vfat --label boot --sourceparams="loader=u-boot"
wic/rock-pi-4.wks +1 -1
@@ -2,6 +2,6 @@ # Released under the MIT license (see COPYING.MIT for the terms) include rk3399-boot.wks -part / --align 131072 --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root +part / --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root bootloader --ptable gpt --append="console=tty1 console=ttyS2,1500000n8 rw root=/dev/${RK_BOOT_DEVICE}p7 rootfstype=ext4 init=/sbin/init"
wic/tinker-board.wks +1 -1
@@ -3,6 +3,6 @@ include rk3288-boot.wks -part / --align 131072 --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root +part / --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root bootloader --ptable gpt --append="console=tty1 console=ttyS2,115200n8 rw root=/dev/${RK_BOOT_DEVICE}p7 rootfstype=ext4 init=/sbin/init"
wic/vyasa-rk3288.wks +1 -1
@@ -2,7 +2,7 @@ # Released under the MIT license (see COPYING.MIT for the terms) include rk3288-boot.wks -part / --align 131072 --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root +part / --ondisk ${RK_BOOT_DEVICE} --source rootfs --fstype=ext4 --label root bootloader --ptable gpt --append="console=tty1 console=ttyS2,115200n8 rw root=/dev/${RK_BOOT_DEVICE}p7 rootfstype=ext4 init=/sbin/init"
Signature · 1 line
2.26.2
Trevor Woerner
AppliedApplied to master, thanks!