summaryrefslogtreecommitdiff
path: root/bsp/samd21/applications
diff options
context:
space:
mode:
authoryangjie <[email protected]>2020-12-28 12:02:31 +0800
committeryangjie <[email protected]>2020-12-28 12:02:31 +0800
commiteeaf1fcc50a9a6d25bebcc531db8e03baafaded3 (patch)
tree3a7e70fbb26fad36211874a5bc4f9f9f22c8fa38 /bsp/samd21/applications
parentef62febf1f2461bdd72efcffde050905865a99c5 (diff)
parente3e86337862c6d84f2b55906a49d48aa33084d39 (diff)
resolve Conflicts
bsp/nrf52832/board/Sconscript bsp/nrf52832/startups/Sconscript bsp/raspberry-pi/raspi4-32/driver/SConscript
Diffstat (limited to 'bsp/samd21/applications')
-rw-r--r--bsp/samd21/applications/startup.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/bsp/samd21/applications/startup.c b/bsp/samd21/applications/startup.c
index aaa75d3f1c..ecbe617d2e 100644
--- a/bsp/samd21/applications/startup.c
+++ b/bsp/samd21/applications/startup.c
@@ -68,12 +68,6 @@ void rtthread_startup(void)
/* show version */
rt_show_version();
- /* init tick */
- rt_system_tick_init();
-
- /* init kernel object */
- rt_system_object_init();
-
/* init timer system */
rt_system_timer_init();