resolve Conflicts

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
2004 changed files with 98787 additions and 437501 deletions
+1 -1
View File
@@ -74,7 +74,7 @@ void rt_hw_spin_unlock(rt_hw_spinlock_t *lock)
/*@{*/
/** shutdown CPU */
void rt_hw_cpu_shutdown()
RT_WEAK void rt_hw_cpu_shutdown()
{
rt_uint32_t level;
rt_kprintf("shutdown...\n");