From: Sven Eckelmann Date: Mon, 3 Sep 2018 07:58:42 +0000 (+0200) Subject: ar71xx: Skip more hashed blocks for OM2P(-HS) 64k variant X-Git-Tag: v19.07.0-rc1~2600 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=78a5d25dca5de9b00890e7a414a6e423c4ba6e19;p=oweals%2Fopenwrt.git ar71xx: Skip more hashed blocks for OM2P(-HS) 64k variant The OM2P(-HS)v4 got a variant which uses a slightly different flash. The standard versions used a flash with 256KB blocks which is no longer available. The replacement flash uses a flash with 64K blocks. The padding for the image rootfs is already for 64K and 256K and thus can be flashed on the device without any problems. Unfortunately, the bootloader will check $rootfs_size (rounded down to the nearest 64k block) minus 1x 64k. But it is now possible that the new JFFS2 rootfs_data starts even earlier and modifies the checked region. The check will then fail and the backup image (when available) will be booted. Just setting it to the same number of skipped blocks as other 64K models avoids this problem. Signed-off-by: Sven Eckelmann --- diff --git a/scripts/om-fwupgradecfg-gen.sh b/scripts/om-fwupgradecfg-gen.sh index dad70b2ea0..4a7094055f 100755 --- a/scripts/om-fwupgradecfg-gen.sh +++ b/scripts/om-fwupgradecfg-gen.sh @@ -24,7 +24,7 @@ case $CE_TYPE in MAX_PART_SIZE=7168 KERNEL_FLASH_ADDR=0x1c0000 FLASH_BS=262144 - MD5_SKIP_BLOCKS=1 + MD5_SKIP_BLOCKS=4 SIZE_FACTOR=1 SIZE_FORMAT="%d" ;;