As explained in recent sysupgrade/nand.sh commits, current NAND sysupgrade is a bit misleading because of nand_do_platform_check behavior. It leaves a special mark in /tmp/sysupgrade-nand-path triggering some diffent code path in nand_upgrade_stage1.
The plan is to have the check function only check the image and nothing else. Then platform code (platform_pre_upgrade) should trigger NAND specific upgrade path. This is what this patch implements. Please note that because of current nand_upgrade_stage1 implementation this patch doesn't change any behaior yet. It only prepares lantiq target for changing nand_do_platform_check (it will be possible after preparing all other targets as well). Signed-off-by: Rafał Miłecki <[email protected]> --- V2: Fix typo in commit message ("implementation") Add only 1 empty line (instead of 2) in platform.sh --- target/linux/lantiq/base-files/lib/upgrade/platform.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/target/linux/lantiq/base-files/lib/upgrade/platform.sh b/target/linux/lantiq/base-files/lib/upgrade/platform.sh index 1688d3a..a38a468 100755 --- a/target/linux/lantiq/base-files/lib/upgrade/platform.sh +++ b/target/linux/lantiq/base-files/lib/upgrade/platform.sh @@ -25,6 +25,16 @@ platform_check_image() { esac } +platform_pre_upgrade() { + local board=$(lantiq_board_name) + + case "$board" in + BTHOMEHUBV2B|BTHOMEHUBV3A|P2812HNUF* ) + nand_do_upgrade $1 + ;; + esac +} + # use default for platform_do_upgrade() disable_watchdog() { -- 1.8.4.5 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
