revert "Add version rollback function for OTA"

Ubiquitous/XiZi_IIoT/board/xidatong-arm32/board.c

@@ -413,8 +413,9 @@ void InitBoardHardware()
     KPrintf("board init done.\n");
     KPrintf("start kernel...\n");
 
-#ifdef MCUBOOT_APPLICATION
+#ifdef TOOL_USING_OTA
-    /* Clear the lastjumpflag after the jump is successful.*/
+    FLASH_Init();
-    app_clear_jumpflag();
+    //跳转成功将对应跳转失败标志设置
+    FLASH_DeInit();
 #endif
 }

Ubiquitous/XiZi_IIoT/tool/bootloader/ota/ota.c

@@ -244,7 +244,6 @@ static void BackupVersion(void)
         ota_info.os.size = ota_info.bak.size;
         ota_info.os.crc32 = ota_info.bak.crc32;
         ota_info.os.version = ota_info.bak.version;
-        ota_info.lastjumpflag = 0xABABABAB;
         strncpy(ota_info.os.description, ota_info.bak.description, sizeof(ota_info.bak.description));
         UpdateOTAFlag(&ota_info);
     }
@@ -269,7 +268,8 @@ static void BootLoaderJumpApp(void)
     ota_info_t ota_info;
     mcuboot.flash_init();
     memcpy(&ota_info, (const void *)FLAG_FLAH_ADDRESS,sizeof(ota_info_t));
-    if (ota_info.lastjumpflag != 0x00000000)
+
+    if(ota_info.lastjumpflag == JUMP_FAILED_FLAG)
     {
         mcuboot.print_string("\r\n------Bootloader false, begin backup!------\r\n");
         BackupVersion();
@@ -277,10 +277,9 @@ static void BootLoaderJumpApp(void)
     }
     else
     {
-        ota_info.lastjumpflag = 0xABABABAB;
+        ota_info.lastjumpflag = JUMP_FAILED_FLAG;
         UpdateOTAFlag(&ota_info);
     }
-
     mcuboot.flash_deinit();
     mcuboot.op_jump();
 }
@@ -306,7 +305,7 @@ static status_t UpdateOTAFlag(ota_info_t *ptr)
     return status;
 }
 
-#ifdef MCUBOOT_APPLICATION
+
 /*******************************************************************************
 * 函 数 名: app_ota
 * 功能描述: 在app中通过命令来进行ota升级,该函数与升级的命令关联
@@ -348,25 +347,24 @@ static void app_ota(void)
 }
 SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0),ota, app_ota, ota function);
 
+
 /*******************************************************************************
 * 函 数 名: app_clear_jumpflag
-* 功能描述: 跳转app成功后,在app中调用将lastjumpflag重置为0x00000000
+* 功能描述: 跳转app成功后,在app中调用将lastjumpflag重置为0XCDCDCDCD
 * 形    参: 无
 * 返 回 值: 无
 *******************************************************************************/
 void app_clear_jumpflag(void)
 {
     mcuboot.flash_init();
-    //跳转成功将对应跳转失败标志清零
+    //跳转成功设置lastjumpflag为JUMP_SUCCESS_FLAG
     ota_info_t ota_info;
     memcpy(&ota_info, (const void *)FLAG_FLAH_ADDRESS,sizeof(ota_info_t));
-    ota_info.lastjumpflag = 0x00000000;
+    ota_info.lastjumpflag = JUMP_SUCCESS_FLAG;
     UpdateOTAFlag(&ota_info);
     mcuboot.flash_deinit();
 }
 
-#endif
-
 
 /*******************************************************************************
 * 函 数 名: ota_entry
@@ -409,7 +407,7 @@ void ota_entry(void)
             switch(ch2)
             {
                 case 0x31:   
-                    BootLoaderJumpApp();
+                    mcuboot.op_jump();
                     break;
 
                 case 0x32:
@@ -427,7 +425,7 @@ void ota_entry(void)
                     }
                    
                     mcuboot.flash_deinit();
-                    BootLoaderJumpApp();
+                    mcuboot.op_jump();
                     break;
 
                 case 0x33:
@@ -438,7 +436,7 @@ void ota_entry(void)
         }
         else
         {
-            BootLoaderJumpApp();
+            mcuboot.op_jump();
         } 
     }
 }

Ubiquitous/XiZi_IIoT/tool/bootloader/ota/ota.h

@@ -17,6 +17,9 @@
 
 #include "flash_ops.h"
 
+#define JUMP_FAILED_FLAG  0XABABABAB
+#define JUMP_SUCCESS_FLAG 0XCDCDCDCD
+
 typedef enum {
     OTA_STATUS_IDLE = 0,     // 空闲状态,没有进行OTA升级
     OTA_STATUS_READY,        // 准备状态,可以进行OTA升级
@@ -44,13 +47,11 @@ typedef struct {
     firmware_t bak;               // Bakup分区属性信息
     firmware_t down;              // Download分区属性信息
     uint32_t status;              // 升级状态,取值来自于ota_status_t类型
-    uint32_t lastjumpflag;        // bootloaer跳转失败的标志,bootloader里置0xABABABAB,跳转成功后在应用里置0x00000000
+    uint32_t lastjumpflag;        // bootloaer跳转失败的标志,bootloader里置0xABABABAB,跳转成功后在应用里置0xCDCDCDCD
     uint32_t reserve[2];          // 保留字段
     uint8_t  error_message[128];  // 错误信息,最多128个字符
 } ota_info_t;
 
-#ifdef MCUBOOT_APPLICATION
 void app_clear_jumpflag(void);
-#endif
 void ota_entry(void);
 #endif