Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-24 13:58:36 +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/unicore32/sep6200/cpu.c
+2 -2
View File
@@ -259,7 +259,7 @@ static void sep6200_poweroff(void)
* reset cpu by dog's time-out
*
*/
void rt_hw_cpu_reset()
RT_WEAK void rt_hw_cpu_reset()
{
rt_kprintf("Soft reset, Restarting system...\n");
@@ -274,7 +274,7 @@ void rt_hw_cpu_reset()
* shutdown CPU
*
*/
void rt_hw_cpu_shutdown()
RT_WEAK void rt_hw_cpu_shutdown()
{
rt_uint32_t level;
rt_kprintf("shutdown...\n");