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

- 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区仍有效自动重搬
feat(boot): 升级改造为A/B分区(新固件先下B区整包校验后搬运A区)
2026-09-24 17:14:09 +08:00 · 2026-09-23 11:16:47 +08:00
4 changed files with 317 additions and 39 deletions
@@ -172,16 +172,16 @@ typedef enum {
 /*当前设备版本/项目选择*/
 #define GATEWAY_VER_INFO										GATEWAY_VER1_0			//版本信息
 #define GATEWAY_PRJ_NUM											GATEWAY_PRJ_YAXIA		//项目编号
-#define GATEWAY_GW_NUM											0x0008					//网关编号(2字节, 1~65535)
+#define GATEWAY_GW_NUM											0x0000					//网关编号(2字节, 1~65535)

 /*CAT1服务器/Lora配置 - 替代原MAC_ADDR_TYPE编译宏, 在Boot中直接配置*/
 #define GATEWAY_SVR_ADDR0										39						//服务器IP[0]
 #define GATEWAY_SVR_ADDR1										106						//服务器IP[1]
 #define GATEWAY_SVR_ADDR2										103						//服务器IP[2]
 #define GATEWAY_SVR_ADDR3										147						//服务器IP[3]
-#define GATEWAY_SVR_PORT										8088					//服务器端口
+#define GATEWAY_SVR_PORT										8080					//服务器端口

-#define GATEWAY_LORA_FREQ										CH8						//Lora中心频率(可配置为CH0~CH119)
+#define GATEWAY_LORA_FREQ										CH0						//Lora中心频率(可配置为CH0~CH119)

 /*默认通道配置 - 在Boot中直接配置, 替代原APP硬编码默认值*/
 #define GATEWAY_MUCH										CH_ETH						//主上传通道
@@ -191,7 +191,7 @@ typedef enum {
 /*********************************下载前必须检查配置项************************************/
 /*****************************************************************************************/

-/*Flash分区 - 32KB Boot + APP(0x8000起) + 参数区(0x7C000)*/
+/*Flash分区 - 32KB Boot + APP_A区(0x8000,232KB,运行) + APP_B区(0x42000,232KB,升级暂存) + 参数区(0x7C000)*/
 #define FLASH_SECTOR_SIZE           		0x2000ul                     //8KB
 #define FLASH_BASE                  		((uint32_t)0x00000000)
 #define FLASH_SIZE                  		(64u * FLASH_SECTOR_SIZE)    //512KB
@@ -199,11 +199,34 @@ typedef enum {
 #define SRAM_BASE												((uint32_t)0x1FFF8000)
 #define SRAM_SIZE												0x2F000ul                //192KB

-#define BOOT_SIZE												(4 * FLASH_SECTOR_SIZE)  //32KB
-#define APP_ADDRESS											(FLASH_BASE + BOOT_SIZE)  //0x8000
-#define APP_SIZE												(58 * FLASH_SECTOR_SIZE) //464KB
-#define BOOT_PARA_ADDRESS								(APP_ADDRESS + APP_SIZE)  //0x7C000
-#define BOOT_PARA_SIZE									(FLASH_SECTOR_SIZE)
+#define BOOT_SIZE											(4 * FLASH_SECTOR_SIZE)  //32KB
+#define APP_A_ADDRESS								(FLASH_BASE + BOOT_SIZE)  //0x8000 A区: 当前运行App
+#define APP_BANK_SECTORS						(29u)  //A/B区各29扇区(232KB)
+#define APP_BANK_SIZE								(APP_BANK_SECTORS * FLASH_SECTOR_SIZE)  //232KB
+#define APP_B_ADDRESS								(APP_A_ADDRESS + APP_BANK_SIZE)  //0x42000 B区: 升级暂存
+#define APP_ADDRESS										APP_A_ADDRESS  //兼容旧名, 指向A区
+#define BOOT_PARA_ADDRESS						(APP_B_ADDRESS + APP_BANK_SIZE)  //0x7C000
+#define	BOOT_PARA_SIZE									(FLASH_SECTOR_SIZE)
+
+/*外部SPI Flash(与App共用SPI1: PC0-NSS/PC1-MISO/PC2-SCK/PC3-MOSI, Mode3) - Cat1远程升级固件暂存区*/
+#define	EXTFLASH_NSS_PORT								(PortC)
+#define	EXTFLASH_NSS_PIN								(Pin00)
+#define	EXTFLASH_NSS_SET()								PORT_SetBits(EXTFLASH_NSS_PORT, EXTFLASH_NSS_PIN)
+#define	EXTFLASH_NSS_CLR()								PORT_ResetBits(EXTFLASH_NSS_PORT, EXTFLASH_NSS_PIN)
+#define	EXTFLASH_SCK_PORT								(PortC)
+#define	EXTFLASH_SCK_PIN								(Pin02)
+#define	EXTFLASH_SCK_FUNC								(Func_Spi1_Sck)
+#define	EXTFLASH_MOSI_PORT								(PortC)
+#define	EXTFLASH_MOSI_PIN								(Pin03)
+#define	EXTFLASH_MOSI_FUNC							(Func_Spi1_Mosi)
+#define	EXTFLASH_MISO_PORT								(PortC)
+#define	EXTFLASH_MISO_PIN								(Pin01)
+#define	EXTFLASH_MISO_FUNC							(Func_Spi1_Miso)
+#define	EXTFLASH_UNIT									(M4_SPI1)
+#define	EXTFLASH_UNIT_CLOCK							(PWC_FCG1_PERIPH_SPI1)
+#define	EXTFLASH_CMD_READ								0x03
+#define	SPIFLASH_SECTORSIZE								4096ul
+#define	FLASH_FW_STASH_SECTOR							4038			//暂存区起始扇区(与App spiflash.h一致)

 #define	DEBUG															1
 #define	USE_SD_CARD												0
@@ -303,10 +326,12 @@ void FeedDog(void);
 void Error_Handler(void);

 /*Flash操作*/
-void FlashWrite(uint32_t Addr, uint32_t *wData, uint8_t wLen);
+void FlashWrite(uint32_t Addr, uint32_t *wData, int wLen);
+void ExtFlashInit(void);
+void ExtFlashRead(uint32_t Addr, uint8_t *rData, uint16_t rLen);
 void ReadBootPara(BootPara rData);
 void WriteBootPara(BootPara wData);
-void EraseFlash(void);
+void EraseFlash(uint32_t BaseAddr, uint32_t SectorCnt);

 #endif

@@ -7,6 +7,7 @@
 #define	APP_START_FLAG									0x55AA5A5A
 #define	APP_UPDATE_FLAG									0xA5A5AA55
 #define	APP_BOOT_UPGRADE_FLAG					0x5A5A55A5	//升级完成标记：Boot升级成功后置位，App启动时据此擦除外部参数分区并恢复APP_START_FLAG(与App侧bsp.h定义保持一致)
+#define	APP_UPDATE_SPI_FLAG						0xA5A55A5A	//Cat1远程升级: 固件已存外部SPI Flash暂存区, Boot据此搬运(与App侧bsp.h定义保持一致)

 typedef enum {
 	UPDATE_CMD_NULL,
@@ -52,6 +53,8 @@ typedef enum {
 	BL_WAIT_REV,
 	BL_GET_DATA_TIMEOUT,
 	BL_START_APP,
+	BL_COPY_TO_A,	//B区镜像搬运到A区阶段
+	BL_STASH_TO_B,	//外部SPI Flash暂存区搬运到B区阶段(Cat1远程升级)
 	BL_RESET
 }BootStatus_m;

@@ -62,6 +65,7 @@ typedef struct {
 	uint32_t AppPackageCnt;
 	uint32_t AppPackageIdx;
 	uint32_t RevErrCnt;
+	uint32_t CopyRetryCnt;	//搬运重试计数
 	
 	uint32_t FeedDogDlyCnt;
 	uint32_t BootLoader1mSDlyCnt;
@@ -393,6 +393,7 @@ void BSP_Init(void)
 	SystemClockConfig();
 	GPIO_Config();
 	RS485Ch1_Config(500000);
+	ExtFlashInit();		/*外部SPI Flash: Cat1远程升级暂存区读取用*/

 	FeedDog();
 	SysTick_Init(1000);
@@ -402,7 +403,7 @@ void BSP_Init(void)
 /*****************************************************************************************
 * Flash操作
 ****************************************************************************************/
-void FlashWrite(uint32_t Addr, uint32_t *wData, uint8_t wLen)
+void FlashWrite(uint32_t Addr, uint32_t *wData, int wLen)
 {
 	EFM_Unlock();
 	EFM_FlashCmd(Enable);
@@ -415,13 +416,100 @@ void FlashWrite(uint32_t Addr, uint32_t *wData, uint8_t wLen)
 	EFM_Lock();
 }

-static void FlashRead(uint32_t u32Addr, uint32_t *rData, uint8_t rLen)
+static void FlashRead(uint32_t u32Addr, uint32_t *rData, int rLen)
 {
 	for(int i = 0; i < rLen / 4; i++) {
 		rData[i] = *((volatile uint32_t*)(u32Addr + i * 4));
 	}
 }

+/*外部SPI Flash驱动: 供Cat1远程升级时读取暂存区固件(App负责写入暂存区)*/
+static uint16_t ExtSpiSendReceive(uint16_t sData)
+{
+	uint16_t retry = 0;
+	uint16_t rData;
+
+	while(Reset == SPI_GetFlag(EXTFLASH_UNIT, SpiFlagSendBufferEmpty)) {
+		retry++;
+		if(retry > 0x4000) {
+			return 0;
+		}
+	}
+	SPI_SendData8(EXTFLASH_UNIT, sData);
+	retry = 0;
+	while(Reset == SPI_GetFlag(EXTFLASH_UNIT, SpiFlagReceiveBufferFull)) {
+		retry++;
+		if(retry > 0x4000) {
+			return 0;
+		}
+	}
+	rData = SPI_ReceiveData8(EXTFLASH_UNIT);
+	return rData;
+}
+
+void ExtFlashInit(void)
+{
+	stc_spi_init_t stcSpiInit;
+	stc_port_init_t stcPortInit;
+
+	MEM_ZERO_STRUCT(stcPortInit);
+	stcPortInit.enPinOType = Pin_OType_Cmos;
+	PORT_Init(EXTFLASH_SCK_PORT, EXTFLASH_SCK_PIN, &stcPortInit);
+	PORT_Init(EXTFLASH_MOSI_PORT, EXTFLASH_MOSI_PIN, &stcPortInit);
+	PORT_Init(EXTFLASH_MISO_PORT, EXTFLASH_MISO_PIN, &stcPortInit);
+	stcPortInit.enPinMode = Pin_Mode_Out;
+	stcPortInit.enPinOType = Pin_OType_Cmos;
+	stcPortInit.enPinDrv = Pin_Drv_H;
+	stcPortInit.enPullUp = Disable;
+	PORT_Init(EXTFLASH_NSS_PORT, EXTFLASH_NSS_PIN, &stcPortInit);
+	EXTFLASH_NSS_SET();
+
+	MEM_ZERO_STRUCT(stcSpiInit);
+	PWC_Fcg1PeriphClockCmd(EXTFLASH_UNIT_CLOCK, Enable);
+	PORT_SetFunc(EXTFLASH_SCK_PORT, EXTFLASH_SCK_PIN, EXTFLASH_SCK_FUNC, Disable);
+	PORT_SetFunc(EXTFLASH_MOSI_PORT, EXTFLASH_MOSI_PIN, EXTFLASH_MOSI_FUNC, Disable);
+	PORT_SetFunc(EXTFLASH_MISO_PORT, EXTFLASH_MISO_PIN, EXTFLASH_MISO_FUNC, Disable);
+
+	stcSpiInit.enClkDiv = SpiClkDiv16;
+	stcSpiInit.enFrameNumber = SpiFrameNumber1;
+	stcSpiInit.enDataLength = SpiDataLengthBit8;
+	stcSpiInit.enFirstBitPosition = SpiFirstBitPositionMSB;
+	stcSpiInit.enSckPolarity = SpiSckIdleLevelHigh;
+	stcSpiInit.enSckPhase = SpiSckOddChangeEvenSample;
+	stcSpiInit.enReadBufferObject = SpiReadReceiverBuffer;
+	stcSpiInit.enWorkMode = SpiWorkMode4Line;
+	stcSpiInit.enTransMode = SpiTransFullDuplex;
+	stcSpiInit.enCommAutoSuspendEn = Disable;
+	stcSpiInit.enModeFaultErrorDetectEn = Disable;
+	stcSpiInit.enParitySelfDetectEn = Disable;
+	stcSpiInit.enParityEn = Disable;
+	stcSpiInit.enParity = SpiParityEven;
+	stcSpiInit.enMasterSlaveMode = SpiModeMaster;
+	stcSpiInit.stcDelayConfig.enSsSetupDelayOption = SpiSsSetupDelayCustomValue;
+	stcSpiInit.stcDelayConfig.enSsSetupDelayTime = SpiSsSetupDelaySck1;
+	stcSpiInit.stcDelayConfig.enSsHoldDelayOption = SpiSsHoldDelayCustomValue;
+	stcSpiInit.stcDelayConfig.enSsHoldDelayTime = SpiSsHoldDelaySck1;
+	stcSpiInit.stcDelayConfig.enSsIntervalTimeOption = SpiSsIntervalCustomValue;
+	stcSpiInit.stcDelayConfig.enSsIntervalTime = SpiSsIntervalSck6PlusPck2;
+	stcSpiInit.stcSsConfig.enSsValidBit = SpiSsValidChannel0;
+	stcSpiInit.stcSsConfig.enSs0Polarity = SpiSsLowValid;
+	SPI_Init(EXTFLASH_UNIT, &stcSpiInit);
+	SPI_Cmd(EXTFLASH_UNIT, Enable);
+}
+
+void ExtFlashRead(uint32_t Addr, uint8_t *rData, uint16_t rLen)
+{
+	EXTFLASH_NSS_CLR();
+	ExtSpiSendReceive(0x03);
+	ExtSpiSendReceive((Addr >> 16) & 0xFF);
+	ExtSpiSendReceive((Addr >> 8) & 0xFF);
+	ExtSpiSendReceive(Addr & 0xFF);
+	for(uint16_t i = 0; i < rLen; i++) {
+		rData[i] = ExtSpiSendReceive(0xFF);
+	}
+	EXTFLASH_NSS_SET();
+}
+
 void ReadBootPara(BootPara rData)
 {
 	FlashRead(BOOT_PARA_ADDRESS, (uint32_t *)rData, sizeof(BootPara_t));
@@ -449,15 +537,15 @@ void WriteBootPara(BootPara wData)
 	EFM_Lock();
 }

-void EraseFlash(void)
+void EraseFlash(uint32_t BaseAddr, uint32_t SectorCnt)
 {
 	EFM_Unlock();
 	EFM_FlashCmd(Enable);
 	while(Set != EFM_GetFlagStatus(EFM_FLAG_RDY)) {	; }

-	/* 只擦APP区, 不擦参数区(BOOT_PARA_ADDRESS) */
-	for(int Addr = APP_ADDRESS; Addr < BOOT_PARA_ADDRESS; Addr += FLASH_SECTOR_SIZE) {
-		EFM_SectorErase(Addr);
+	/*从BaseAddr起连续擦除SectorCnt个扇区(A/B区通用), 不碰参数区*/
+	for(uint32_t i = 0; i < SectorCnt; i++) {
+		EFM_SectorErase(BaseAddr + i * FLASH_SECTOR_SIZE);
 		FeedDog();
 	}
 	EFM_Lock();
@@ -40,14 +40,14 @@ void InitCrc32Table(uint32_t* Crc32Tbl)

 /*****************************************************************************************
 * 函数名称: GetCrc32
-* 功能描述: 计算APP区CRC32校验值
+* 功能描述: 计算指定区域CRC32校验值
 *****************************************************************************************/
-uint32_t GetCrc32(int dwLen)
+uint32_t GetCrc32(uint32_t BaseAddr, int dwLen)
 {
 	uint32_t Data;
 	uint32_t dwCrc32Data = 0xFFFFFFFF;
 	for(int dwCnt = 0; dwCnt < dwLen; dwCnt++) {
-		Data = *((volatile uint8_t*)(APP_ADDRESS + dwCnt));
+		Data = *((volatile uint8_t*)(BaseAddr + dwCnt));
 		uint32_t dwTbl = (dwCrc32Data ^ Data) & 0xFF;
 		dwCrc32Data = ((dwCrc32Data >> 8) & 0xFFFFFF) ^ pdwCrc32Tbl[dwTbl];
 	}
@@ -110,11 +110,92 @@ static bool JumpToApp(uint32_t AppAddr)

 /*****************************************************************************************
 * 函数名称: AppWriteFlash
-* 功能描述: 写APP数据到Flash (每包200字节)
+* 功能描述: 写升级数据到Flash指定分区 (每包200字节, 尾部不足4字节按0xFF补齐)
+* 参    数: BaseAddr 分区基址(B区), AddrOffset 分区内偏移, wData 数据, wLen 字节数
+* 返 回 值: 无
 *****************************************************************************************/
-void AppWriteFlash(uint32_t AddrOffset, uint8_t *wData, int wLen)
+void AppWriteFlash(uint32_t BaseAddr, uint32_t AddrOffset, uint8_t *wData, int wLen)
 {
-	FlashWrite(APP_ADDRESS + AddrOffset, (uint32_t *)wData, wLen / 4);
+	int FullWords = wLen / 4;
+	int Remain = wLen % 4;
+	uint32_t Word;
+
+	FlashWrite(BaseAddr + AddrOffset, (uint32_t *)wData, FullWords);
+	if(Remain > 0) {	/*末包尾字节补0xFF组字写入, 保证与AppSize逐字节CRC一致*/
+		Word = 0xFFFFFFFF;
+		memcpy(&Word, &wData[FullWords * 4], Remain);
+		FlashWrite(BaseAddr + AddrOffset + FullWords * 4, &Word, 1);
+	}
+}
+
+static uint32_t s_CopyBuf[FLASH_SECTOR_SIZE / 4];	/*搬运缓冲(8KB)*/
+
+/*****************************************************************************************
+* 函数名称: CopyAppBtoA
+* 功能描述: 将B区已校验固件搬运到A区(逐扇区: 擦A→读B→写A), 完成后整包校验A区
+* 参    数: 无
+* 返 回 值: true=搬运并校验通过
+*****************************************************************************************/
+static bool CopyAppBtoA(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;
+
+	for(Sec = 0; Sec < FullSectors; Sec++) {
+		Base = APP_A_ADDRESS + Sec * FLASH_SECTOR_SIZE;
+		EraseFlash(Base, 1);
+		for(uint32_t i = 0; i < SecPerBank; i++) {
+			s_CopyBuf[i] = *((volatile uint32_t *)(APP_B_ADDRESS + Sec * FLASH_SECTOR_SIZE + i * 4));
+		}
+		FlashWrite(Base, s_CopyBuf, SecPerBank);
+	}
+	if(RemainWords > 0) {
+		Base = APP_A_ADDRESS + FullSectors * FLASH_SECTOR_SIZE;
+		EraseFlash(Base, 1);
+		for(uint32_t i = 0; i < RemainWords; i++) {
+			s_CopyBuf[i] = *((volatile uint32_t *)(APP_B_ADDRESS + FullSectors * FLASH_SECTOR_SIZE + i * 4));
+		}
+		FlashWrite(Base, s_CopyBuf, RemainWords);
+	}
+	/*整包校验A区*/
+	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);
+	}
 }

 /*****************************************************************************************
@@ -188,6 +269,10 @@ bool AnalyzeData(uint8_t *rData, uint16_t rLen)
 			return false;
 		}
 		UDReq UpData = (UDReq)&rData[sizeof(FrameHeader_t)];
+		/*固件大小合法性检查: 为0或超出B区容量时拒绝升级*/
+		if(UpData->AppSize == 0 || UpData->AppSize > APP_BANK_SIZE) {
+			return false;
+		}
 		BL.Para.AppFlag = 0;
 		BL.Para.UpdateFlag = APP_UPDATE_FLAG;
 		BL.Para.Crc32Check = UpData->AppCrc32;
@@ -204,12 +289,16 @@ bool AnalyzeData(uint8_t *rData, uint16_t rLen)
 		if(BL.UpDateFlag == false) {
 			return false;
 		}
+		/*状态守卫: 仅下载状态接收数据, 防止搬运/复位阶段迟到包破坏B区*/
+		if(BL.Status != BL_GET_DATA && BL.Status != BL_WAIT_REV) {
+			return false;
+		}
 		DownRes DownData = (DownRes)&rData[sizeof(FrameHeader_t)];
 		if(BL.AppPackageIdx != DownData->PackageIndex) {
 			return false;
 		}
 		/*写数据到Flash*/
-		AppWriteFlash(BL.AppPackageIdx * 200, &rData[sizeof(FrameHeader_t) + sizeof(DownResponse_t)], DownData->DataLen);
+		AppWriteFlash(APP_B_ADDRESS, BL.AppPackageIdx * 200, &rData[sizeof(FrameHeader_t) + sizeof(DownResponse_t)], DownData->DataLen);
 		BL.AppPackageIdx++;
 		BL.RevErrCnt = 0;

@@ -218,23 +307,22 @@ bool AnalyzeData(uint8_t *rData, uint16_t rLen)
 			BL.BootLoader1mSDlyCnt = 5;
 		}
 		else {
-			/*全部数据处理完成, 校验CRC32*/
-			uint32_t crc32 = GetCrc32(BL.Para.AppSize);
+			/*全部数据处理完成: 整包校验B区CRC32(此时尚未触碰A区, 原App完好)*/
+			uint32_t crc32 = GetCrc32(APP_B_ADDRESS, BL.Para.AppSize);
 			if(crc32 == BL.Para.Crc32Check) {
-				/*置升级完成标记(每次升级均置位)：Boot本身不擦除外部Flash，
-				  App启动时检测到此标记后擦除外部参数分区并恢复APP_START_FLAG*/
-				BL.Para.AppFlag = APP_BOOT_UPGRADE_FLAG;
-				BL.Para.UpdateFlag = 0;
-				WriteBootPara(&BL.Para);
-				BL.BootLoader1mSDlyCnt = 100;
-				BL.Status = BL_RESET;
+				/*B区校验通过: 关闭接收, 进入搬运阶段(B→A), 搬运并校验A区后才置升级完成标记*/
+				BL.UpDateFlag = false;
+				BL.CopyRetryCnt = 0;
+				BL.Status = BL_COPY_TO_A;
 			}
 			else {
-				BL.Para.AppFlag = 0;
+				/*B区校验失败: A区未动, 恢复老App启动标志并复位, 主机可重新发起升级*/
+				BL.Para.AppFlag = APP_START_FLAG;
 				BL.Para.UpdateFlag = 0;
 				WriteBootPara(&BL.Para);
 				BL.UpDateFlag = false;
-				BL.Status = BL_IDLE;
+				BL.BootLoader1mSDlyCnt = 100;
+				BL.Status = BL_RESET;
 			}
 		}
 		return true;
@@ -359,9 +447,77 @@ void BootLoaderLoopHandler(void)
 			}
 			break;

+		case BL_COPY_TO_A:
+			/*搬运B区已校验镜像到A区, 完成后整包校验A区*/
+		if(CopyAppBtoA()) {
+				/*搬运校验通过: 立即擦除B区作废镜像, 防止下次升级时B区残留被误判为断电续传而跳过下载*/
+				EraseFlash(APP_B_ADDRESS, APP_BANK_SECTORS);
+				/*置升级完成标记(每次升级均置位), App启动时擦除外部参数分区并恢复APP_START_FLAG*/
+				BL.Para.AppFlag = APP_BOOT_UPGRADE_FLAG;
+				BL.Para.UpdateFlag = 0;
+				WriteBootPara(&BL.Para);
+				BL.BootLoader1mSDlyCnt = 100;
+				BL.Status = BL_RESET;
+			}
+			else {
+				/*搬运后A区校验失败(B区仍有效): 重试一次搬运*/
+				if(BL.CopyRetryCnt++ < 1) {
+					break;
+				}
+				/*重试仍失败: 清标志停留等待主机重新升级*/
+				BL.Para.AppFlag = 0;
+				BL.Para.UpdateFlag = 0;
+				WriteBootPara(&BL.Para);
+				BL.Status = BL_IDLE;
+			}
+			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();
-			EraseFlash();
+			/*固件大小非法: 无法下载, 恢复老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;
+			}
+			/*先校验B区: 已有完整有效镜像则直接搬运(断电续传: 下载完未搬运/搬运中断电)*/
+			if(GetCrc32(APP_B_ADDRESS, BL.Para.AppSize) == BL.Para.Crc32Check) {
+				BL.CopyRetryCnt = 0;
+				BL.Status = BL_COPY_TO_A;
+				break;
+			}
+			/*B区无效: 仅擦除B区(A区保留原App), 逐包下载到B区*/
+			EraseFlash(APP_B_ADDRESS, APP_BANK_SECTORS);
 			FeedDog();
 			BL.Status = BL_GET_DATA;
 			BL.BootLoader1mSDlyCnt = 200;
@@ -392,12 +548,14 @@ void BootLoaderLoopHandler(void)
 				BL.Status = BL_GET_DATA;
 			}
 			else {
-				BL.Status = BL_IDLE;
-				BL.Para.AppFlag = 0;
-				BL.RevErrCnt = 0;
+				/*下载超时: A区未动, 恢复老App启动标志并复位(设备回到可运行状态)*/
+				BL.Para.AppFlag = APP_START_FLAG;
 				BL.Para.UpdateFlag = 0;
 				WriteBootPara(&BL.Para);
+				BL.RevErrCnt = 0;
 				BL.UpDateFlag = false;
+				BL.BootLoader1mSDlyCnt = 100;
+				BL.Status = BL_RESET;
 			}
 			break;
 	}
@@ -467,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;
 		}