autotest
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support ota function for xidatong-arm32

This commit is contained in:
wgzAIIT 2023-04-19 15:36:39 +08:00
parent a9deff5cd0
commit 8bc7546828
10 changed files with 304 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Ubiquitous/XiZi_IIoT/board/xidatong-arm32/board.c
View File

@ -65,7 +65,7 @@ Modification:
#endif
#ifdef BSP_USING_OTA
#include <flash.h>
#include <imxrt_ota.h>
#endif
#ifdef BSP_USING_SEMC
@ -365,6 +365,31 @@ struct InitSequenceDesc _board_init[] =
{ " NONE ",NONE },
};
#ifdef BSP_USING_OTA
static void OtaCmd(void)
{
int32_t Size;
FLASH_Init();
UartConfig();
UpdateOTAStatus(OTA_STATUS_DOWNLOADING);
Size = SerialDownload(DOWN_FLAH_ADDRESS);
UpdateOTAStatus(OTA_STATUS_DOWNLOADED);
if(Size > 0)
{
UpdateOTAFlag(Size, 0x11223344, OTA_STATUS_READY, "OTA Test!","No error!");
}
FLASH_DeInit();
__set_FAULTMASK(1);
NVIC_SystemReset();
}
SHELL_EXPORT_CMD(SHELL_CMD_PERMISSION(0)|SHELL_CMD_TYPE(SHELL_TYPE_CMD_FUNC)|SHELL_CMD_PARAM_NUM(0),ota, OtaCmd, ota function);
#endif
/**
* This function will initial imxrt1050 board.
*/
@ -412,9 +437,4 @@ void InitBoardHardware()
}
KPrintf("board init done.\n");
KPrintf("start kernel...\n");
#ifdef BSP_USING_OTA
FLASH_Init();
//Flash operation
FLASH_DeInit();
#endif
}

2
Ubiquitous/XiZi_IIoT/board/xidatong-arm32/include/board.h
View File

@ -33,7 +33,7 @@ Modification:
#include "fsl_clock.h"
#include "fsl_enet.h"
#include "clock_config.h"
// #include <xizi.h>
#include <xizi.h>
#include <arch_interrupt.h>
extern int heap_start;

2
Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/common/Makefile
View File

@ -5,7 +5,7 @@ ifeq ($(CONFIG_BSP_USING_SDIO),y)
endif
ifeq ($(CONFIG_BSP_USING_OTA),y)
SRC_FILES += fsl_romapi.c flash.c mcuboot.c common.c ymodem.c
SRC_FILES += fsl_romapi.c flash.c mcuboot.c common.c ymodem.c imxrt_ota.c
endif
include $(KERNEL_ROOT)/compiler.mk

2
Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/common/flash.c
View File

@ -593,7 +593,7 @@ status_t flash_write(uint32_t start_addr, uint8_t *buf, uint32_t byte_cnt)
status_t flash_read(uint32_t addr, uint8_t *buf, uint32_t len)
{
/* For FlexSPI Memory ReadBack, use IP Command instead of AXI command for security */
if((addr >= 0x60000000) && (addr < 0x70000000))
if((addr >= 0x60000000) && (addr < 0x61000000))
{
return FLASH_Read(addr, (void *)buf, len);
}

214
Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/common/imxrt_ota.c Normal file
View File

@ -0,0 +1,214 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: imxrt_ota.c
* @brief: file imxrt_ota.c
* @version: 1.0
* @author: AIIT XUOS Lab
* @date: 2023/3/24
*/
#include <stdio.h>
#include <time.h>
#include <string.h>
#include "flash.h"
#include "common.h"
#include "imxrt_ota.h"
static const uint32_t crc32tab[] = {
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
};
static uint32_t calculate_crc32(uint32_t addr, uint32_t len)
{
uint32_t crc = 0xFFFFFFFF;
uint8_t byte = 0xFF;
for(uint32_t i = 0; i < len; i++)
{
byte = *((volatile uint8_t *)(addr + i));
crc = crc32tab[(crc ^ byte) & 0xff] ^ (crc >> 8);
}
return crc^0xFFFFFFFF;
}
void UpdateOTAStatus(ota_status_t status)
{
ota_info_t ota_info;
//从Flash中读取OTA信息
memcpy(&ota_info, (const void *)FLAG_FLAH_ADDRESS,sizeof(ota_info_t));
ota_info.status = status;
flash_erase(FLAG_FLAH_ADDRESS,sizeof(ota_info_t));
flash_write(FLAG_FLAH_ADDRESS,(void *)&ota_info,sizeof(ota_info_t));
}
void UpdateOTAFlag(uint32_t app_size, uint32_t version, uint32_t status, uint8_t* description, uint8_t* error_message)
{
ota_info_t ota_info; // 定义OTA信息结构体
// 从Flash中读取OTA信息
memcpy(&ota_info, (const void *)FLAG_FLAH_ADDRESS,sizeof(ota_info_t));
ota_info.app_size = app_size;
ota_info.crc = calculate_crc32(DOWN_FLAH_ADDRESS, app_size);
ota_info.version = version;
strncpy(ota_info.description, description,sizeof(ota_info.description));
ota_info.status = status;
strncpy(ota_info.error_message, error_message,sizeof(ota_info.error_message));
flash_erase(FLAG_FLAH_ADDRESS,sizeof(ota_info_t));
flash_write(FLAG_FLAH_ADDRESS,(void *)&ota_info,sizeof(ota_info_t));
}
void UpdateApplication(void)
{
status_t status;
ota_info_t ota_info; // 定义OTA信息结构体
// 从Flash中读取OTA信息
memcpy(&ota_info, (const void *)FLAG_FLAH_ADDRESS,sizeof(ota_info_t));
// 如果OTA升级状态为准备状态，可以进行升级
if(ota_info.status == OTA_STATUS_READY)
{
Serial_PutString("\r\n------Start to update the app!------\r\n");
// 校验固件CRC
if(calculate_crc32(DOWN_FLAH_ADDRESS, ota_info.app_size) == ota_info.crc)
{
// 如果CRC校验通过,开始升级,逐字节搬移
UpdateOTAStatus(OTA_STATUS_UPDATING);
status = flash_copy(XIUOS_FLAH_ADDRESS,BAKUP_FLAH_ADDRESS,ota_info.app_size);
if(status != kStatus_Success)
{
Serial_PutString("------Backup app failed!------\r\n");
goto finish;
}
status = flash_copy(DOWN_FLAH_ADDRESS,XIUOS_FLAH_ADDRESS,ota_info.app_size);
if(status != kStatus_Success)
{
Serial_PutString("------Firmware partition copy failed!------\r\n");
goto finish;
}
// 校验搬移后的固件CRC
if(calculate_crc32(XIUOS_FLAH_ADDRESS, ota_info.app_size) == ota_info.crc)
{
ota_info.status = OTA_STATUS_IDLE; // 将OTA升级状态设置为IDLE
memset(ota_info.error_message,0,sizeof(ota_info.error_message)); // 清空错误信息
// 将更新后的OTA信息写入Flash中
flash_erase(FLAG_FLAH_ADDRESS,sizeof(ota_info_t));
flash_write(FLAG_FLAH_ADDRESS,(void *)&ota_info,sizeof(ota_info_t));
Serial_PutString("\r\n------Update completed!------\r\n");
goto finish;
}
else
{
// 如果搬移后的固件CRC校验失败，升级失败
ota_info.status = OTA_STATUS_ERROR; // 将OTA升级状态设置为ERROR
memset(ota_info.error_message,0,sizeof(ota_info.error_message));
snprintf((char *)ota_info.error_message, sizeof(ota_info.error_message), "APP Firmware CRC check failed!"); // 记录错误信息
// 将更新后的OTA信息写入Flash中
flash_erase(FLAG_FLAH_ADDRESS,sizeof(ota_info_t));
flash_write(FLAG_FLAH_ADDRESS,(void *)&ota_info,sizeof(ota_info_t));
Serial_PutString("\r\n------APP Firmware CRC check failed!------\r\n");
goto finish;
}
}
else
{
// 如果CRC校验失败，升级失败
ota_info.status = OTA_STATUS_ERROR; // 将OTA升级状态设置为ERROR
memset(ota_info.error_message,0,sizeof(ota_info.error_message));
snprintf((char *)ota_info.error_message, sizeof(ota_info.error_message), "Download Firmware CRC check failed"); // 记录错误信息
// 将更新后的OTA信息写入Flash中
flash_erase(FLAG_FLAH_ADDRESS,sizeof(ota_info_t));
flash_write(FLAG_FLAH_ADDRESS,(void *)&ota_info,sizeof(ota_info_t));
Serial_PutString("\r\n------Download Firmware CRC check failed!------\r\n");
goto finish;
}
}
else
{
Serial_PutString("\r\n------No need to update the app!------\r\n");
goto finish;
}
finish:
// 跳转到应用程序
jump_to_application();
}

9
Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/common/mcuboot.c
View File

@ -15,15 +15,13 @@
#include <stdint.h>
#include <xs_base.h>
#include "flash.h"
#include "mcuboot.h"
#include "ymodem.h"
#include "imxrt_ota.h"
#include "common.h"
#ifdef MCUBOOT_BOOTLOADER
extern void ImxrtMsDelay(uint32 ms);
static void jump_to_application(void)
void jump_to_application(void)
{
SCB->VTOR = (uint32_t)XIUOS_FLAH_ADDRESS;
@ -36,7 +34,6 @@ static void jump_to_application(void)
asm volatile("BX R0");
}
void BootLoaderJumpApp(void)
{
uint8_t ch1, ch2;
@ -76,7 +73,7 @@ void BootLoaderJumpApp(void)
break;
case 0x32:
FLASH_Init();
SerialDownload(XIUOS_FLAH_ADDRESS);
UpdateApplication();
FLASH_DeInit();
break;
case 0x33:

4
Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/common/ymodem.c
View File

@ -351,7 +351,7 @@ int32_t Ymodem_Receive (uint8_t *buf, const uint32_t addr)
* @param flash start addr
* @retval None
*/
void SerialDownload(const uint32_t addr)
int32_t SerialDownload(const uint32_t addr)
{
uint8_t Number[10] = {0};
int32_t Size = 0;
@ -384,4 +384,6 @@ void SerialDownload(const uint32_t addr)
{
Serial_PutString("\n\rFailed to receive the file!\n\r");
}
return Size;
}

52
Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/include/imxrt_ota.h Normal file
View File

@ -0,0 +1,52 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
/**
* @file: imxrt_ota.h
* @brief: file imxrt_ota.h
* @version: 1.0
* @author: AIIT XUOS Lab
* @date: 2023/3/24
*/
#ifndef __IMXRT_OTA__H__
#define __IMXRT_OTA__H__
#include <stdint.h>
#include "mcuboot.h"
#include "flash.h"
#include "ymodem.h"
typedef enum {
OTA_STATUS_IDLE = 0, // 空闲状态，没有进行OTA升级
OTA_STATUS_READY, // 准备状态，可以进行OTA升级
OTA_STATUS_DOWNLOADING, // 正在下载固件
OTA_STATUS_DOWNLOADED, // 固件下载完成，可以进行升级
OTA_STATUS_UPDATING, // 正在进行OTA升级
OTA_STATUS_ERROR, // 出现错误，升级失败
} ota_status_t;
typedef struct {
uint32_t app_size; // 应用程序大小
uint32_t crc; // 应用程序CRC校验值
uint32_t version; // 应用程序版本号
uint32_t status; // 升级状态
uint8_t description[64]; // 应用程序升级说明，最多64个字符
uint8_t error_message[64]; // 错误信息，最多64个字符
} ota_info_t;
void UpdateOTAStatus(ota_status_t status);
void UpdateOTAFlag(uint32_t app_size, uint32_t version, uint32_t status, uint8_t* description, uint8_t* error_message);
void UpdateApplication(void);
#endif

2
Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/include/mcuboot.h
View File

@ -23,5 +23,7 @@
#include "fsl_gpio.h"
#include "fsl_lpuart.h"
void jump_to_application(void);
#endif

2
Ubiquitous/XiZi_IIoT/board/xidatong-arm32/third_party_driver/include/ymodem.h
View File

@ -52,7 +52,7 @@
#define NAK_TIMEOUT (0x100000)
#define MAX_ERRORS (5)
void SerialDownload(const uint32_t addr);
int32_t SerialDownload(const uint32_t addr);
int32_t Ymodem_Receive (uint8_t *buf, const uint32_t addr);
#endif