YuanHongbin/HC32F460BootLoader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(ota): Boot支持外部Flash暂存搬运(BL_STASH_TO_B状态)

Browse Source 
- bsp.c/h: 外部SPI Flash只读驱动(SPI1, 与App同总线Mode3)
- main.c/h: BL_STASH_TO_B状态: AppSize门禁 -> 外部Flash逐8KB搬运B区 -> CRC校验 -> 进BL_COPY_TO_A复用现有搬运链
- 搬运幂等: 搬运中断电重启后B区仍有效自动重搬
This commit is contained in:
YuanHongbin
2026-09-24 17:14:09 +08:00
parent 48ed25015d
commit 48b789c0c4
4 changed files with 177 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/User/Src/main.c
+64
View File
@@ -164,6 +164,40 @@ static bool CopyAppBtoA(void)
return (GetCrc32(APP_A_ADDRESS, BL.Para.AppSize) == BL.Para.Crc32Check);
}
static uint32_t s_StashBuf[FLASH_SECTOR_SIZE / 4]; /*外部Flash读缓冲(8KB)*/
/*****************************************************************************************
* 函数名称: StashToB
* 功能描述: Cat1远程升级: 将外部SPI Flash暂存区固件搬运到B区(逐8KB: 读外部2×4KB→擦写B区1×8KB)
* 参 数: 无
* 返 回 值: 无(搬运后由调用方CRC32校验B区)
*****************************************************************************************/
static void StashToB(void)
{
uint32_t TotalWords = (BL.Para.AppSize + 3) / 4; /*实际固件字数*/
uint32_t SecPerBank = FLASH_SECTOR_SIZE / 4;
uint32_t FullSectors = TotalWords / SecPerBank;
uint32_t RemainWords = TotalWords % SecPerBank;
uint32_t Sec, Base, SrcAddr;
for(Sec = 0; Sec < FullSectors; Sec++) {
Base = APP_B_ADDRESS + Sec * FLASH_SECTOR_SIZE;
SrcAddr = FLASH_FW_STASH_SECTOR * SPIFLASH_SECTORSIZE + Sec * FLASH_SECTOR_SIZE;
FeedDog();
ExtFlashRead(SrcAddr, (uint8_t *)s_StashBuf, FLASH_SECTOR_SIZE);
EraseFlash(Base, 1);
FlashWrite(Base, s_StashBuf, SecPerBank);
}
if(RemainWords > 0) {
Base = APP_B_ADDRESS + FullSectors * FLASH_SECTOR_SIZE;
SrcAddr = FLASH_FW_STASH_SECTOR * SPIFLASH_SECTORSIZE + FullSectors * FLASH_SECTOR_SIZE;
FeedDog();
ExtFlashRead(SrcAddr, (uint8_t *)s_StashBuf, RemainWords * 4);
EraseFlash(Base, 1);
FlashWrite(Base, s_StashBuf, RemainWords);
}
}
/*****************************************************************************************
* 函数名称: SendResponseCmd
* 功能描述: 发送响应帧 (0x7D + DevMac)
@@ -438,6 +472,33 @@ void BootLoaderLoopHandler(void)
}
break;
case BL_STASH_TO_B:
FeedDog();
/*固件大小非法: 无法搬运, 恢复老App(A区未动)并复位*/
if(BL.Para.AppSize == 0 || BL.Para.AppSize > APP_BANK_SIZE) {
BL.Para.AppFlag = APP_START_FLAG;
BL.Para.UpdateFlag = 0;
WriteBootPara(&BL.Para);
BL.BootLoader1mSDlyCnt = 100;
BL.Status = BL_RESET;
break;
}
/*外部SPI Flash暂存区→B区(逐8KB), StashToB幂等: 搬运中断电重启后自动重做*/
StashToB();
/*B区整包校验: 通过进搬运, 失败清标志回老App*/
if(GetCrc32(APP_B_ADDRESS, BL.Para.AppSize) == BL.Para.Crc32Check) {
BL.CopyRetryCnt = 0;
BL.Status = BL_COPY_TO_A;
}
else {
BL.Para.AppFlag = APP_START_FLAG;
BL.Para.UpdateFlag = 0;
WriteBootPara(&BL.Para);
BL.BootLoader1mSDlyCnt = 100;
BL.Status = BL_RESET;
}
break;
case BL_ERASE_FLASH:
FeedDog();
/*固件大小非法: 无法下载, 恢复老App(A区未动)并复位*/
@@ -564,6 +625,9 @@ int32_t main(void)
if(BL.Para.AppFlag == APP_START_FLAG || BL.Para.AppFlag == APP_BOOT_UPGRADE_FLAG) {
BL.Status = BL_START_APP;
}
else if(BL.Para.UpdateFlag == APP_UPDATE_SPI_FLAG) {
BL.Status = BL_STASH_TO_B; /*Cat1远程升级: 外部Flash暂存区→B区→A区*/
}
else if(BL.Para.UpdateFlag == APP_UPDATE_FLAG) {
BL.Status = BL_ERASE_FLASH;
}