Przeglądaj źródła

更新MCU工程:
1. 修复MCU-iram工程空片烧录amtldr.bin代码异常问题。
2. 屏蔽MCU-iram及sram-nos工程rtc模块看门狗功能,因要求程序运行时间需大于其配置时间,关闭RTC看门狗才会生效。为避免实际应用场景运行实际小于其配置时间,从而导致配置不生效,产生非预期结果,故将其功能屏蔽。

helen 4 dni temu
rodzic
commit
b9f202cf3b

+ 3 - 3
amt630hv160-mcu/amt630hv160-mcu-iram/src/App/loader_cpu.c

@@ -391,9 +391,9 @@ int BurnCpuImage(eUpdateMedia umedia)
 	f_close(&fp);
 
 
-	CPU_UPDATE_EraseData(sysinfo->loader_offset, align_size);
-	CPU_UPDATE_WriteData(sysinfo->loader_offset, filebuf, align_size);
-	CPU_UPDATE_ReadData(sysinfo->loader_offset, tmpbuf, align_size);
+	CPU_UPDATE_EraseData(CPU_LOADERA_OFFSET, align_size);
+	CPU_UPDATE_WriteData(CPU_LOADERA_OFFSET, filebuf, align_size);
+	CPU_UPDATE_ReadData(CPU_LOADERA_OFFSET, tmpbuf, align_size);
 
 	checksum = *(u32*)(filebuf + APPLDR_CHECKSUM_OFFSET);
 	*(u32*)(tmpbuf + APPLDR_CHECKSUM_OFFSET) = 0;

+ 1 - 1
amt630hv160-mcu/amt630hv160-mcu-iram/src/ArkmicroFiles/libcpu-amt630hv160/include/amt630hv160_rtc.h

@@ -102,7 +102,7 @@ static inline int is_leap_year(unsigned int year)
 //	Sleep and wake-up related
 int RTC_SendCmd(eRTCCmd cmd, int enable);
 int RTC_WriteReg(eRTCCmd cmd, vu32 *reg, u32 value);
-void RTC_SetWatchdog(eRTCWdtTmo tmo, int enable);
+//void RTC_SetWatchdog(eRTCWdtTmo tmo, int enable);
 void RTC_PowerDown(int fastboot);
 void RTC_CanStbOut(int id, int value);
 void RTC_SetWakeup(eRTCWakeupSource src, eRTCWakeupMode mode, int enable);

+ 2 - 1
amt630hv160-mcu/amt630hv160-mcu-iram/src/ArkmicroFiles/libcpu-amt630hv160/source/amt630hv160_rtc.c

@@ -97,6 +97,7 @@ retry:
 	return 0;
 }
 
+/*
 void RTC_SetWatchdog(eRTCWdtTmo tmo, int enable)
 {
 	if (tmo < RTC_WDT_NOCHANGE) {
@@ -110,6 +111,7 @@ void RTC_SetWatchdog(eRTCWdtTmo tmo, int enable)
 	else
 		RTC_SendCmd(RTC_WDTEn, 0);
 }
+*/
 
 void RTC_PowerDown(int fastboot)
 {
@@ -119,7 +121,6 @@ void RTC_PowerDown(int fastboot)
 
 	RTC_SendCmd(RTC_SleepMode, 1);
 	RTC_SendCmd(RTC_ISOForce, 0);
-	RTC_SetWatchdog(RTC_WDT_2S, 1);
 
 	val &= ~(0xffff << 16);
 	if (fastboot) {

+ 0 - 2
amt630hv160-mcu/amt630hv160-mcu-iram/src/main.c

@@ -94,8 +94,6 @@ static void prvSetupHardware( void )
 	printf("gpu_pll=%d\n", CLK_GetPLLFreq(SYSCTRL->GPUPLL_CFG));
 
 #ifdef _RTC
-	//唤醒后关wdt,默认为关
-	RTC_SetWatchdog(RTC_WDT_2S, 0);
 	RTC_SendCmd(RTC_Clk32KSel, 0);
 #endif
 #ifdef _SPI0

+ 1 - 1
amt630hv160-mcu/amt630hv160-mcu-sram-nos/src/ArkmicroFiles/libcpu-amt630hv160/include/amt630hv160_rtc.h

@@ -102,7 +102,7 @@ static inline int is_leap_year(unsigned int year)
 //	Sleep and wake-up related
 int RTC_SendCmd(eRTCCmd cmd, int enable);
 int RTC_WriteReg(eRTCCmd cmd, vu32 *reg, u32 value);
-void RTC_SetWatchdog(eRTCWdtTmo tmo, int enable);
+//void RTC_SetWatchdog(eRTCWdtTmo tmo, int enable);
 void RTC_PowerDown(int fastboot);
 void RTC_CanStbOut(int id, int value);
 void RTC_SetWakeup(eRTCWakeupSource src, eRTCWakeupMode mode, int enable);

+ 2 - 1
amt630hv160-mcu/amt630hv160-mcu-sram-nos/src/ArkmicroFiles/libcpu-amt630hv160/source/amt630hv160_rtc.c

@@ -97,6 +97,7 @@ retry:
 	return 0;
 }
 
+/*
 void RTC_SetWatchdog(eRTCWdtTmo tmo, int enable)
 {
 	if (tmo < RTC_WDT_NOCHANGE) {
@@ -110,6 +111,7 @@ void RTC_SetWatchdog(eRTCWdtTmo tmo, int enable)
 	else
 		RTC_SendCmd(RTC_WDTEn, 0);
 }
+*/
 
 void RTC_PowerDown(int fastboot)
 {
@@ -119,7 +121,6 @@ void RTC_PowerDown(int fastboot)
 
 	RTC_SendCmd(RTC_SleepMode, 1);
 	RTC_SendCmd(RTC_ISOForce, 0);
-	RTC_SetWatchdog(RTC_WDT_2S, 1);
 
 	val &= ~(0xffff << 16);
 	if (fastboot) {

+ 0 - 2
amt630hv160-mcu/amt630hv160-mcu-sram-nos/src/main.c

@@ -94,8 +94,6 @@ static void prvSetupHardware( void )
 	printf("gpu_pll=%d\n", CLK_GetPLLFreq(SYSCTRL->GPUPLL_CFG));
 
 #ifdef _RTC
-	//唤醒后关wdt,默认为关
-	RTC_SetWatchdog(RTC_WDT_2S, 0);
 	RTC_SendCmd(RTC_Clk32KSel, 0);
 #endif
 #ifdef _SPI0