Compare commits
3 Commits
ac718a463a
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
| aef9d4effe | |||
| 74960e18ff | |||
| 67fc98f998 |
+2
-1
@@ -84,7 +84,6 @@ static void update_on_download(uint8_t* frame, int len, uint8_t* pload, int size
|
|||||||
|
|
||||||
if (crc_rom == g_update.cfg.Crc32Check)
|
if (crc_rom == g_update.cfg.Crc32Check)
|
||||||
{
|
{
|
||||||
g_update.cfg.AppFlag = 0;
|
|
||||||
g_update.cfg.UpdateFlag = 0;
|
g_update.cfg.UpdateFlag = 0;
|
||||||
g_update.cfg.PackageNum = 0;
|
g_update.cfg.PackageNum = 0;
|
||||||
|
|
||||||
@@ -188,6 +187,8 @@ int app_update_entry(struct pt *pt)
|
|||||||
if (g_update.cfg.UpdateFlag == APP_UPDATE_FLAG)
|
if (g_update.cfg.UpdateFlag == APP_UPDATE_FLAG)
|
||||||
{
|
{
|
||||||
g_update.isNeedUpdate = 1;
|
g_update.isNeedUpdate = 1;
|
||||||
|
g_update.cfg.AppFlag = APP_BOOT_UPGRADE_FLAG;
|
||||||
|
dev_boot_write_param(g_update.cfg);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -95,7 +95,7 @@
|
|||||||
<tRmem>1</tRmem>
|
<tRmem>1</tRmem>
|
||||||
<tRfunc>0</tRfunc>
|
<tRfunc>0</tRfunc>
|
||||||
<tRbox>1</tRbox>
|
<tRbox>1</tRbox>
|
||||||
<tRtrace>0</tRtrace>
|
<tRtrace>1</tRtrace>
|
||||||
<sRSysVw>1</sRSysVw>
|
<sRSysVw>1</sRSysVw>
|
||||||
<tRSysVw>1</tRSysVw>
|
<tRSysVw>1</tRSysVw>
|
||||||
<sRunDeb>0</sRunDeb>
|
<sRunDeb>0</sRunDeb>
|
||||||
@@ -125,7 +125,7 @@
|
|||||||
<SetRegEntry>
|
<SetRegEntry>
|
||||||
<Number>0</Number>
|
<Number>0</Number>
|
||||||
<Key>JL2CM3</Key>
|
<Key>JL2CM3</Key>
|
||||||
<Name>-U4294967295 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO31 -FD1FFF8000 -FC1000 -FN2 -FF0HC32F460_512K.FLM -FS00 -FL080000 -FP0($$Device:HC32F460KETA$FlashARM\HC32F460_512K.FLM) -FF1HC32F460_otp.FLM -FS13000C00 -FL13FC -FP1($$Device:HC32F460KETA$FlashARM\HC32F460_otp.FLM)</Name>
|
<Name>-U4294967295 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8027 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO31 -FD1FFF8000 -FC1000 -FN2 -FF0HC32F460_512K.FLM -FS00 -FL080000 -FP0($$Device:HC32F460KETA$FlashARM\HC32F460_512K.FLM) -FF1HC32F460_otp.FLM -FS13000C00 -FL13FC -FP1($$Device:HC32F460KETA$FlashARM\HC32F460_otp.FLM)</Name>
|
||||||
</SetRegEntry>
|
</SetRegEntry>
|
||||||
<SetRegEntry>
|
<SetRegEntry>
|
||||||
<Number>0</Number>
|
<Number>0</Number>
|
||||||
@@ -158,40 +158,7 @@
|
|||||||
<Name>-T0</Name>
|
<Name>-T0</Name>
|
||||||
</SetRegEntry>
|
</SetRegEntry>
|
||||||
</TargetDriverDllRegistry>
|
</TargetDriverDllRegistry>
|
||||||
<Breakpoint>
|
<Breakpoint/>
|
||||||
<Bp>
|
|
||||||
<Number>0</Number>
|
|
||||||
<Type>0</Type>
|
|
||||||
<LineNumber>40</LineNumber>
|
|
||||||
<EnabledFlag>1</EnabledFlag>
|
|
||||||
<Address>11242</Address>
|
|
||||||
<ByteObject>0</ByteObject>
|
|
||||||
<HtxType>0</HtxType>
|
|
||||||
<ManyObjects>0</ManyObjects>
|
|
||||||
<SizeOfObject>0</SizeOfObject>
|
|
||||||
<BreakByAccess>0</BreakByAccess>
|
|
||||||
<BreakIfRCount>1</BreakIfRCount>
|
|
||||||
<Filename>..\App\main.c</Filename>
|
|
||||||
<ExecCommand></ExecCommand>
|
|
||||||
<Expression>\\boot\../App/main.c\40</Expression>
|
|
||||||
</Bp>
|
|
||||||
<Bp>
|
|
||||||
<Number>1</Number>
|
|
||||||
<Type>0</Type>
|
|
||||||
<LineNumber>36</LineNumber>
|
|
||||||
<EnabledFlag>1</EnabledFlag>
|
|
||||||
<Address>11236</Address>
|
|
||||||
<ByteObject>0</ByteObject>
|
|
||||||
<HtxType>0</HtxType>
|
|
||||||
<ManyObjects>0</ManyObjects>
|
|
||||||
<SizeOfObject>0</SizeOfObject>
|
|
||||||
<BreakByAccess>0</BreakByAccess>
|
|
||||||
<BreakIfRCount>1</BreakIfRCount>
|
|
||||||
<Filename>..\App\main.c</Filename>
|
|
||||||
<ExecCommand></ExecCommand>
|
|
||||||
<Expression>\\boot\../App/main.c\36</Expression>
|
|
||||||
</Bp>
|
|
||||||
</Breakpoint>
|
|
||||||
<WatchWindow1>
|
<WatchWindow1>
|
||||||
<Ww>
|
<Ww>
|
||||||
<count>0</count>
|
<count>0</count>
|
||||||
@@ -238,7 +205,7 @@
|
|||||||
<DebugFlag>
|
<DebugFlag>
|
||||||
<trace>0</trace>
|
<trace>0</trace>
|
||||||
<periodic>1</periodic>
|
<periodic>1</periodic>
|
||||||
<aLwin>1</aLwin>
|
<aLwin>0</aLwin>
|
||||||
<aCover>0</aCover>
|
<aCover>0</aCover>
|
||||||
<aSer1>0</aSer1>
|
<aSer1>0</aSer1>
|
||||||
<aSer2>0</aSer2>
|
<aSer2>0</aSer2>
|
||||||
|
|||||||
+1
-2
@@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
#define APP_START_FLAG 0x55AA5A5A
|
#define APP_START_FLAG 0x55AA5A5A
|
||||||
#define APP_UPDATE_FLAG 0xA5A5AA55
|
#define APP_UPDATE_FLAG 0xA5A5AA55
|
||||||
|
#define APP_BOOT_UPGRADE_FLAG 0x5A5A55A5
|
||||||
|
|
||||||
#define BOOT_BASE (FLASH_BASE)
|
#define BOOT_BASE (FLASH_BASE)
|
||||||
#define BOOT_SIZE (4*FLASH_SECTOR_SIZE)
|
#define BOOT_SIZE (4*FLASH_SECTOR_SIZE)
|
||||||
@@ -15,8 +16,6 @@
|
|||||||
#define BOOT_PARA_ADDRESS (APP_ADDRESS + APP_SIZE)
|
#define BOOT_PARA_ADDRESS (APP_ADDRESS + APP_SIZE)
|
||||||
#define BOOT_PARA_SIZE (FLASH_SECTOR_SIZE)
|
#define BOOT_PARA_SIZE (FLASH_SECTOR_SIZE)
|
||||||
|
|
||||||
#define APP_START_FLAG 0x55AA5A5A
|
|
||||||
#define APP_UPDATE_FLAG 0xA5A5AA55
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
uint32_t AppFlag;
|
uint32_t AppFlag;
|
||||||
|
|||||||
Reference in New Issue
Block a user