Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-26 06:43:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

resolve Conflicts

Browse Source 
bsp/nrf52832/board/Sconscript
	bsp/nrf52832/startups/Sconscript
	bsp/raspberry-pi/raspi4-32/driver/SConscript
This commit is contained in:
yangjie
2020-12-28 12:02:31 +08:00
parent ef62febf1f e3e8633786
commit eeaf1fcc50
2004 changed files with 98787 additions and 437501 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libcpu/arm/cortex-m4/cpuport.c
+1 -1
View File
@@ -428,7 +428,7 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info)
/**
* shutdown CPU
*/
void rt_hw_cpu_shutdown(void)
RT_WEAK void rt_hw_cpu_shutdown(void)
{
rt_kprintf("shutdown...\n");