Skip to content

Commit 9bc18eb

Browse files
zhuyf233zhuyf233
committed
Merge branch 'master' of https://github.com/RT-Thread/rt-thread 
2 parents 8897a1c + 1ea5135 commit 9bc18eb

File tree

10 files changed

+812
-596
lines changed

10 files changed

+812
-596
lines changed

‎bsp/smartfusion2/project.uvopt‎

Lines changed: 171 additions & 171 deletions
Large diffs are not rendered by default.

‎bsp/smartfusion2/project.uvoptx‎

Lines changed: 166 additions & 166 deletions
Large diffs are not rendered by default.

‎bsp/smartfusion2/project.uvproj‎

Lines changed: 119 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@
139139
<RestoreMemoryDisplay>1</RestoreMemoryDisplay>
140140
<RestoreFunctions>0</RestoreFunctions>
141141
<RestoreToolbox>1</RestoreToolbox>
142-
<RestoreTracepoints>1</RestoreTracepoints>
142+
<RestoreTracepoints>0</RestoreTracepoints>
143143
<RestoreSysVw>1</RestoreSysVw>
144-
<UsePdscDebugDescription>0</UsePdscDebugDescription>
144+
<UsePdscDebugDescription>1</UsePdscDebugDescription>
145145
</Target>
146146
<RunDebugAfterBuild>0</RunDebugAfterBuild>
147147
<TargetSelection>6</TargetSelection>
@@ -170,7 +170,7 @@
170170
<Capability>0</Capability>
171171
<DriverSelection>-1</DriverSelection>
172172
</Flash1>
173-
<bUseTDR>1</bUseTDR>
173+
<bUseTDR>0</bUseTDR>
174174
<Flash2>BIN\UL2CM3.DLL</Flash2>
175175
<Flash3></Flash3>
176176
<Flash4></Flash4>
@@ -356,13 +356,13 @@
356356
<wLevel>0</wLevel>
357357
<uThumb>0</uThumb>
358358
<uSurpInc>0</uSurpInc>
359-
<uC99>0</uC99>
359+
<uC99>1</uC99>
360360
<useXO>0</useXO>
361361
<VariousControls>
362362
<MiscControls></MiscControls>
363-
<Define>RT_USING_ARM_LIBC</Define>
363+
<Define>RT_USING_ARM_LIBC, __RTTHREAD__, __CLK_TCK=RT_TICK_PER_SECOND</Define>
364364
<Undefine></Undefine>
365-
<IncludePath>.;..\..\include;applications;board;CMSIS;drivers;libraries\sys_config;libraries\mss_gpio;libraries\mss_uart;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\finsh;..\..\components\libc\compilers\armlibc;..\..\components\libc\compilers\common</IncludePath>
365+
<IncludePath>applications;board;CMSIS;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;..\..\components\drivers\include;..\..\components\drivers\include;..\..\components\drivers\include;drivers;..\..\components\finsh;.;..\..\include;..\..\components\libc\compilers\armlibc;..\..\components\libc\compilers\common;libraries\sys_config;libraries\mss_gpio;libraries\mss_uart</IncludePath>
366366
</VariousControls>
367367
</Cads>
368368
<Aads>
@@ -402,81 +402,6 @@
402402
</TargetArmAds>
403403
</TargetOption>
404404
<Groups>
405-
<Group>
406-
<GroupName>Kernel</GroupName>
407-
<Files>
408-
<File>
409-
<FileName>clock.c</FileName>
410-
<FileType>1</FileType>
411-
<FilePath>..\..\src\clock.c</FilePath>
412-
</File>
413-
<File>
414-
<FileName>components.c</FileName>
415-
<FileType>1</FileType>
416-
<FilePath>..\..\src\components.c</FilePath>
417-
</File>
418-
<File>
419-
<FileName>device.c</FileName>
420-
<FileType>1</FileType>
421-
<FilePath>..\..\src\device.c</FilePath>
422-
</File>
423-
<File>
424-
<FileName>idle.c</FileName>
425-
<FileType>1</FileType>
426-
<FilePath>..\..\src\idle.c</FilePath>
427-
</File>
428-
<File>
429-
<FileName>ipc.c</FileName>
430-
<FileType>1</FileType>
431-
<FilePath>..\..\src\ipc.c</FilePath>
432-
</File>
433-
<File>
434-
<FileName>irq.c</FileName>
435-
<FileType>1</FileType>
436-
<FilePath>..\..\src\irq.c</FilePath>
437-
</File>
438-
<File>
439-
<FileName>kservice.c</FileName>
440-
<FileType>1</FileType>
441-
<FilePath>..\..\src\kservice.c</FilePath>
442-
</File>
443-
<File>
444-
<FileName>mem.c</FileName>
445-
<FileType>1</FileType>
446-
<FilePath>..\..\src\mem.c</FilePath>
447-
</File>
448-
<File>
449-
<FileName>mempool.c</FileName>
450-
<FileType>1</FileType>
451-
<FilePath>..\..\src\mempool.c</FilePath>
452-
</File>
453-
<File>
454-
<FileName>object.c</FileName>
455-
<FileType>1</FileType>
456-
<FilePath>..\..\src\object.c</FilePath>
457-
</File>
458-
<File>
459-
<FileName>scheduler.c</FileName>
460-
<FileType>1</FileType>
461-
<FilePath>..\..\src\scheduler.c</FilePath>
462-
</File>
463-
<File>
464-
<FileName>signal.c</FileName>
465-
<FileType>1</FileType>
466-
<FilePath>..\..\src\signal.c</FilePath>
467-
</File>
468-
<File>
469-
<FileName>thread.c</FileName>
470-
<FileType>1</FileType>
471-
<FilePath>..\..\src\thread.c</FilePath>
472-
</File>
473-
<File>
474-
<FileName>timer.c</FileName>
475-
<FileType>1</FileType>
476-
<FilePath>..\..\src\timer.c</FilePath>
477-
</File>
478-
</Files>
479-
</Group>
480405
<Group>
481406
<GroupName>Applications</GroupName>
482407
<Files>
@@ -518,42 +443,7 @@
518443
</Files>
519444
</Group>
520445
<Group>
521-
<GroupName>Drivers</GroupName>
522-
<Files>
523-
<File>
524-
<FileName>drv_uart.c</FileName>
525-
<FileType>1</FileType>
526-
<FilePath>drivers\drv_uart.c</FilePath>
527-
</File>
528-
<File>
529-
<FileName>drv_gpio.c</FileName>
530-
<FileType>1</FileType>
531-
<FilePath>drivers\drv_gpio.c</FilePath>
532-
</File>
533-
</Files>
534-
</Group>
535-
<Group>
536-
<GroupName>Libraries</GroupName>
537-
<Files>
538-
<File>
539-
<FileName>sys_config.c</FileName>
540-
<FileType>1</FileType>
541-
<FilePath>libraries\sys_config\sys_config.c</FilePath>
542-
</File>
543-
<File>
544-
<FileName>mss_gpio.c</FileName>
545-
<FileType>1</FileType>
546-
<FilePath>libraries\mss_gpio\mss_gpio.c</FilePath>
547-
</File>
548-
<File>
549-
<FileName>mss_uart.c</FileName>
550-
<FileType>1</FileType>
551-
<FilePath>libraries\mss_uart\mss_uart.c</FilePath>
552-
</File>
553-
</Files>
554-
</Group>
555-
<Group>
556-
<GroupName>cpu</GroupName>
446+
<GroupName>CPU</GroupName>
557447
<Files>
558448
<File>
559449
<FileName>backtrace.c</FileName>
@@ -632,6 +522,21 @@
632522
</File>
633523
</Files>
634524
</Group>
525+
<Group>
526+
<GroupName>Drivers</GroupName>
527+
<Files>
528+
<File>
529+
<FileName>drv_uart.c</FileName>
530+
<FileType>1</FileType>
531+
<FilePath>drivers\drv_uart.c</FilePath>
532+
</File>
533+
<File>
534+
<FileName>drv_gpio.c</FileName>
535+
<FileType>1</FileType>
536+
<FilePath>drivers\drv_gpio.c</FilePath>
537+
</File>
538+
</Files>
539+
</Group>
635540
<Group>
636541
<GroupName>finsh</GroupName>
637542
<Files>
@@ -652,6 +557,76 @@
652557
</File>
653558
</Files>
654559
</Group>
560+
<Group>
561+
<GroupName>Kernel</GroupName>
562+
<Files>
563+
<File>
564+
<FileName>clock.c</FileName>
565+
<FileType>1</FileType>
566+
<FilePath>..\..\src\clock.c</FilePath>
567+
</File>
568+
<File>
569+
<FileName>components.c</FileName>
570+
<FileType>1</FileType>
571+
<FilePath>..\..\src\components.c</FilePath>
572+
</File>
573+
<File>
574+
<FileName>device.c</FileName>
575+
<FileType>1</FileType>
576+
<FilePath>..\..\src\device.c</FilePath>
577+
</File>
578+
<File>
579+
<FileName>idle.c</FileName>
580+
<FileType>1</FileType>
581+
<FilePath>..\..\src\idle.c</FilePath>
582+
</File>
583+
<File>
584+
<FileName>ipc.c</FileName>
585+
<FileType>1</FileType>
586+
<FilePath>..\..\src\ipc.c</FilePath>
587+
</File>
588+
<File>
589+
<FileName>irq.c</FileName>
590+
<FileType>1</FileType>
591+
<FilePath>..\..\src\irq.c</FilePath>
592+
</File>
593+
<File>
594+
<FileName>kservice.c</FileName>
595+
<FileType>1</FileType>
596+
<FilePath>..\..\src\kservice.c</FilePath>
597+
</File>
598+
<File>
599+
<FileName>mem.c</FileName>
600+
<FileType>1</FileType>
601+
<FilePath>..\..\src\mem.c</FilePath>
602+
</File>
603+
<File>
604+
<FileName>mempool.c</FileName>
605+
<FileType>1</FileType>
606+
<FilePath>..\..\src\mempool.c</FilePath>
607+
</File>
608+
<File>
609+
<FileName>object.c</FileName>
610+
<FileType>1</FileType>
611+
<FilePath>..\..\src\object.c</FilePath>
612+
</File>
613+
<File>
614+
<FileName>scheduler.c</FileName>
615+
<FileType>1</FileType>
616+
<FilePath>..\..\src\scheduler.c</FilePath>
617+
</File>
618+
<File>
619+
<FileName>thread.c</FileName>
620+
<FileType>1</FileType>
621+
<FilePath>..\..\src\thread.c</FilePath>
622+
</File>
623+
<File>
624+
<FileName>timer.c</FileName>
625+
<FileType>1</FileType>
626+
<FilePath>..\..\src\timer.c</FilePath>
627+
</File>
628+
</Files>
629+
</Group>
655630
<Group>
656631
<GroupName>libc</GroupName>
657632
<Files>
@@ -666,9 +641,14 @@
666641
<FilePath>..\..\components\libc\compilers\armlibc\mem_std.c</FilePath>
667642
</File>
668643
<File>
669-
<FileName>stubs.c</FileName>
644+
<FileName>syscalls.c</FileName>
645+
<FileType>1</FileType>
646+
<FilePath>..\..\components\libc\compilers\armlibc\syscalls.c</FilePath>
647+
</File>
648+
<File>
649+
<FileName>stdlib.c</FileName>
670650
<FileType>1</FileType>
671-
<FilePath>..\..\components\libc\compilers\armlibc\stubs.c</FilePath>
651+
<FilePath>..\..\components\libc\compilers\common\stdlib.c</FilePath>
672652
</File>
673653
<File>
674654
<FileName>time.c</FileName>
@@ -677,6 +657,26 @@
677657
</File>
678658
</Files>
679659
</Group>
660+
<Group>
661+
<GroupName>Libraries</GroupName>
662+
<Files>
663+
<File>
664+
<FileName>sys_config.c</FileName>
665+
<FileType>1</FileType>
666+
<FilePath>libraries\sys_config\sys_config.c</FilePath>
667+
</File>
668+
<File>
669+
<FileName>mss_gpio.c</FileName>
670+
<FileType>1</FileType>
671+
<FilePath>libraries\mss_gpio\mss_gpio.c</FilePath>
672+
</File>
673+
<File>
674+
<FileName>mss_uart.c</FileName>
675+
<FileType>1</FileType>
676+
<FilePath>libraries\mss_uart\mss_uart.c</FilePath>
677+
</File>
678+
</Files>
679+
</Group>
680680
</Groups>
681681
</Target>
682682
</Targets>

0 commit comments

Comments
 (0)