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

..

e906

resolve Conflicts

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