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

feat(app): 配合Boot A/B分区升级, 链接区限定A区232KB

Browse Source 
bsp.h分区宏改A区29扇区+新增B区宏(FLASH_BINFO_BASE仍=0x7C000); GateWay_app.sct IROM 0x74000→0x3A000;
Update()增加AppSize<=FLASH_APPB_SIZE校验, 超限拒绝不置标志不复位
This commit is contained in:
YuanHongbin
2026-09-23 11:16:55 +08:00
parent 2cf17c4387
commit b1cba74aa7
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Project/GateWay/MDK/GateWay.uvprojx
+1 -1
View File
@@ -1165,7 +1165,7 @@
<OCR_RVCT4>
<Type>1</Type>
<StartAddress>0x8000</StartAddress>
<Size>0x6c000</Size>
<Size>0x3a000</Size>
</OCR_RVCT4>
<OCR_RVCT5>
<Type>1</Type>
Project/GateWay/MDK/GateWay_app.sct
+3 -3
View File
@@ -1,10 +1,10 @@
; *************************************************************
; *** Scatter-Loading Description File for GateWay APP ***
; *** Flash: APP区 0x8000起 (Boot 32KB), 到参数区0x7C000前 ***
; *** Flash: A区 0x8000~0x41FFF(232KB, 运行) + B区 0x42000~0x7BFFF(232KB, 升级暂存), 参数区0x7C000 ***
; *************************************************************
LR_IROM1 0x00008000 0x00074000 {
ER_IROM1 0x00008000 0x00074000 {
LR_IROM1 0x00008000 0x0003A000 {
ER_IROM1 0x00008000 0x0003A000 {
*.o (RESET, +First)
*(InRoot$$Sections)
.ANY (+RO)
Project/GateWay/MDK/output/GateWay.sct
+2 -2
View File
@@ -2,8 +2,8 @@
; *** Scatter-Loading Description File generated by uVision ***
; *************************************************************
LR_IROM1 0x00008000 0x0006C000 { ; load region size_region
ER_IROM1 0x00008000 0x0006C000 { ; load address = execution address
LR_IROM1 0x00008000 0x0003A000 { ; load region size_region
ER_IROM1 0x00008000 0x0003A000 { ; load address = execution address
*.o (RESET, +First)
*(InRoot$$Sections)
.ANY (+RO)
Project/GateWay/source/User/Inc/bsp.h
+6 -4
View File
@@ -16,12 +16,14 @@
#define FLASH_BOOT_BASE (FLASH_BASE)
#define FLASH_BOOT_SIZE (4*FLASH_SECTOR_SIZE)
//app
//app A区(运行, 0x8000起, 232KB) + B区(升级暂存, 0x42000起, 232KB) - 与Boot A/B分区一致
#define FLASH_APP_BASE (FLASH_BOOT_BASE+ FLASH_BOOT_SIZE)
#define FLASH_APP_SIZE (58*FLASH_SECTOR_SIZE)
#define FLASH_APP_SIZE (29*FLASH_SECTOR_SIZE)
#define FLASH_APPB_BASE (FLASH_APP_BASE + FLASH_APP_SIZE)
#define FLASH_APPB_SIZE (29*FLASH_SECTOR_SIZE)
//boot info
#define FLASH_BINFO_BASE (FLASH_APP_BASE + FLASH_APP_SIZE)
//boot info (0x7C000, 位置不变)
#define FLASH_BINFO_BASE (FLASH_APPB_BASE + FLASH_APPB_SIZE)
#define FLASH_BINFO_SIZE (1*FLASH_SECTOR_SIZE)
//user config
Project/GateWay/source/User/Src/Update.c
+6
View File
@@ -19,6 +19,12 @@ void Update(uint8_t *PayLoad)
memcpy(&Req, PayLoad, sizeof(UpDataRequset_t));
/*固件大小校验: 为0或超出B区容量时拒绝升级, 不置标志不复位*/
if(Req.AppSize == 0 || Req.AppSize > FLASH_APPB_SIZE) {
U_DBG_LOG("AppSize invalid: %d (max %d)\r\n", (int)Req.AppSize, (int)FLASH_APPB_SIZE);
return;
}
/*读回现有boot参数，保留FirstRunFlag等字段*/
dev_boot_read_param(&cfg);
cfg.AppSize = Req.AppSize;