yangjie eeaf1fcc50 resolve Conflicts ...

bsp/nrf52832/board/Sconscript
	bsp/nrf52832/startups/Sconscript
	bsp/raspberry-pi/raspi4-32/driver/SConscript

2020-12-28 12:02:31 +08:00

..

context_gcc.S

convert end of line

2013-01-08 05:05:02 -08:00

cpu.c

[libcpu][update]重启与关机函数：rt_hw_cpu_shutdown、rt_hw_cpu_reset，补充WEAK属性

2020-11-20 08:49:51 +08:00

exception_gcc.S

Update exception_gcc.S

2020-11-20 18:43:10 +08:00

interrupt.c

convert end of line

2013-01-08 05:05:02 -08:00

SConscript

[SConscript]update group name

2020-12-19 16:49:11 +08:00

serial.c

[BSP] change the type of cmd.

2017-10-16 13:23:03 +08:00

serial.h

convert end of line

2013-01-08 05:05:02 -08:00

stack.c

convert end of line

2013-01-08 05:05:02 -08:00