From 3c4b78e166fa5b9061ffbe5328959ceec7123207 Mon Sep 17 00:00:00 2001 From: Daniel Campora Date: Fri, 11 Sep 2015 09:34:03 +0200 Subject: [PATCH] cc3200: Keep overwriting the same image on sequential updates. --- cc3200/ftp/updater.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cc3200/ftp/updater.c b/cc3200/ftp/updater.c index 2f983b16c6..2a2d47072f 100644 --- a/cc3200/ftp/updater.c +++ b/cc3200/ftp/updater.c @@ -87,8 +87,9 @@ bool updater_check_path (void *path) { if (!sl_FsOpen((unsigned char *)IMG_BOOT_INFO, FS_MODE_OPEN_READ, NULL, &fhandle)) { ASSERT (sizeof(sBootInfo_t) == sl_FsRead(fhandle, 0, (unsigned char *)&sBootInfo, sizeof(sBootInfo_t))); sl_FsClose(fhandle, 0, 0, 0); + // if we still have an image pending for verification, keep overwriting it if ((sBootInfo.Status == IMG_STATUS_CHECK && sBootInfo.ActiveImg == IMG_ACT_UPDATE2) || - sBootInfo.ActiveImg == IMG_ACT_UPDATE1) { + (sBootInfo.ActiveImg == IMG_ACT_UPDATE1 && sBootInfo.Status != IMG_STATUS_CHECK)) { updater_data.path = IMG_UPDATE2; } }