Skip to content

Commit 311d924

Browse files
balanceTWKbalanceTWK
committed
[bsp][stm32] update stm32 mdk project
1 parent eabf1cf commit 311d924

38 files changed

+2581
-5220
lines changed

‎bsp/stm32/stm32f103-atk-warshipv3/project.uvoptx‎

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

‎bsp/stm32/stm32f103-atk-warshipv3/project.uvprojx‎

Lines changed: 84 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
<TargetName>rt-thread</TargetName>
1111
<ToolsetNumber>0x4</ToolsetNumber>
1212
<ToolsetName>ARM-ADS</ToolsetName>
13+
<pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
1314
<uAC6>0</uAC6>
1415
<TargetOption>
1516
<TargetCommonOption>
1617
<Device>STM32F103ZE</Device>
1718
<Vendor>STMicroelectronics</Vendor>
18-
<PackID>Keil.STM32F1xx_DFP.2.2.0</PackID>
19+
<PackID>Keil.STM32F1xx_DFP.2.3.0</PackID>
1920
<PackURL>http://www.keil.com/pack/</PackURL>
2021
<Cpu>IROM(0x08000000,0x80000) IRAM(0x20000000,0x10000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu>
2122
<FlashUtilSpec></FlashUtilSpec>
@@ -51,7 +52,7 @@
5152
<OutputName>rt-thread</OutputName>
5253
<CreateExecutable>1</CreateExecutable>
5354
<CreateLib>0</CreateLib>
54-
<CreateHexFile>1</CreateHexFile>
55+
<CreateHexFile>0</CreateHexFile>
5556
<DebugInformation>1</DebugInformation>
5657
<BrowseInformation>0</BrowseInformation>
5758
<ListingPath>.\build\keil\List\</ListingPath>
@@ -183,6 +184,7 @@
183184
<hadXRAM>0</hadXRAM>
184185
<uocXRam>0</uocXRam>
185186
<RvdsVP>0</RvdsVP>
187+
<RvdsMve>0</RvdsMve>
186188
<hadIRAM2>0</hadIRAM2>
187189
<hadIROM2>0</hadIROM2>
188190
<StupSel>8</StupSel>
@@ -336,7 +338,7 @@
336338
<MiscControls></MiscControls>
337339
<Define>USE_HAL_DRIVER, STM32F103xE</Define>
338340
<Undefine></Undefine>
339-
<IncludePath>.;..\..\..\include;applications;.;board;board\CubeMX_Config\Inc;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\finsh;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include</IncludePath>
341+
<IncludePath>applications;..\..\..\libcpu\arm\common;..\..\..\libcpu\arm\cortex-m3;..\..\..\components\drivers\include;..\..\..\components\drivers\include;..\..\..\components\drivers\include;board;board\CubeMX_Config\Inc;board\ports\include;..\libraries\HAL_Drivers;..\libraries\HAL_Drivers\config;..\..\..\components\finsh;.;..\..\..\include;..\libraries\STM32F1xx_HAL\CMSIS\Device\ST\STM32F1xx\Include;..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Inc;..\libraries\STM32F1xx_HAL\CMSIS\Include</IncludePath>
340342
</VariousControls>
341343
</Cads>
342344
<Aads>
@@ -370,100 +372,100 @@
370372
<ScatterFile>.\board\linker_scripts\link.sct</ScatterFile>
371373
<IncludeLibs></IncludeLibs>
372374
<IncludeLibsPath></IncludeLibsPath>
373-
<Misc> --keep *.o(.rti_fn.*) --keep *.o(FSymTab)</Misc>
375+
<Misc></Misc>
374376
<LinkerInputFile></LinkerInputFile>
375377
<DisabledWarnings></DisabledWarnings>
376378
</LDads>
377379
</TargetArmAds>
378380
</TargetOption>
379381
<Groups>
380382
<Group>
381-
<GroupName>Kernel</GroupName>
383+
<GroupName>Applications</GroupName>
382384
<Files>
383385
<File>
384-
<FileName>clock.c</FileName>
385-
<FileType>1</FileType>
386-
<FilePath>..\..\..\src\clock.c</FilePath>
387-
</File>
388-
<File>
389-
<FileName>components.c</FileName>
386+
<FileName>main.c</FileName>
390387
<FileType>1</FileType>
391-
<FilePath>..\..\..\src\components.c</FilePath>
388+
<FilePath>applications\main.c</FilePath>
392389
</File>
390+
</Files>
391+
</Group>
392+
<Group>
393+
<GroupName>cpu</GroupName>
394+
<Files>
393395
<File>
394-
<FileName>cpu.c</FileName>
396+
<FileName>backtrace.c</FileName>
395397
<FileType>1</FileType>
396-
<FilePath>..\..\..\src\cpu.c</FilePath>
398+
<FilePath>..\..\..\libcpu\arm\common\backtrace.c</FilePath>
397399
</File>
398400
<File>
399-
<FileName>device.c</FileName>
401+
<FileName>div0.c</FileName>
400402
<FileType>1</FileType>
401-
<FilePath>..\..\..\src\device.c</FilePath>
403+
<FilePath>..\..\..\libcpu\arm\common\div0.c</FilePath>
402404
</File>
403405
<File>
404-
<FileName>idle.c</FileName>
406+
<FileName>showmem.c</FileName>
405407
<FileType>1</FileType>
406-
<FilePath>..\..\..\src\idle.c</FilePath>
408+
<FilePath>..\..\..\libcpu\arm\common\showmem.c</FilePath>
407409
</File>
408410
<File>
409-
<FileName>ipc.c</FileName>
411+
<FileName>cpuport.c</FileName>
410412
<FileType>1</FileType>
411-
<FilePath>..\..\..\src\ipc.c</FilePath>
413+
<FilePath>..\..\..\libcpu\arm\cortex-m3\cpuport.c</FilePath>
412414
</File>
413415
<File>
414-
<FileName>irq.c</FileName>
415-
<FileType>1</FileType>
416-
<FilePath>..\..\..\src\irq.c</FilePath>
416+
<FileName>context_rvds.S</FileName>
417+
<FileType>2</FileType>
418+
<FilePath>..\..\..\libcpu\arm\cortex-m3\context_rvds.S</FilePath>
417419
</File>
420+
</Files>
421+
</Group>
422+
<Group>
423+
<GroupName>DeviceDrivers</GroupName>
424+
<Files>
418425
<File>
419-
<FileName>kservice.c</FileName>
426+
<FileName>pin.c</FileName>
420427
<FileType>1</FileType>
421-
<FilePath>..\..\..\src\kservice.c</FilePath>
428+
<FilePath>..\..\..\components\drivers\misc\pin.c</FilePath>
422429
</File>
423430
<File>
424-
<FileName>mem.c</FileName>
431+
<FileName>serial.c</FileName>
425432
<FileType>1</FileType>
426-
<FilePath>..\..\..\src\mem.c</FilePath>
433+
<FilePath>..\..\..\components\drivers\serial\serial.c</FilePath>
427434
</File>
428435
<File>
429-
<FileName>mempool.c</FileName>
436+
<FileName>completion.c</FileName>
430437
<FileType>1</FileType>
431-
<FilePath>..\..\..\src\mempool.c</FilePath>
438+
<FilePath>..\..\..\components\drivers\src\completion.c</FilePath>
432439
</File>
433440
<File>
434-
<FileName>object.c</FileName>
441+
<FileName>dataqueue.c</FileName>
435442
<FileType>1</FileType>
436-
<FilePath>..\..\..\src\object.c</FilePath>
443+
<FilePath>..\..\..\components\drivers\src\dataqueue.c</FilePath>
437444
</File>
438445
<File>
439-
<FileName>scheduler.c</FileName>
446+
<FileName>pipe.c</FileName>
440447
<FileType>1</FileType>
441-
<FilePath>..\..\..\src\scheduler.c</FilePath>
448+
<FilePath>..\..\..\components\drivers\src\pipe.c</FilePath>
442449
</File>
443450
<File>
444-
<FileName>signal.c</FileName>
451+
<FileName>ringblk_buf.c</FileName>
445452
<FileType>1</FileType>
446-
<FilePath>..\..\..\src\signal.c</FilePath>
453+
<FilePath>..\..\..\components\drivers\src\ringblk_buf.c</FilePath>
447454
</File>
448455
<File>
449-
<FileName>thread.c</FileName>
456+
<FileName>ringbuffer.c</FileName>
450457
<FileType>1</FileType>
451-
<FilePath>..\..\..\src\thread.c</FilePath>
458+
<FilePath>..\..\..\components\drivers\src\ringbuffer.c</FilePath>
452459
</File>
453460
<File>
454-
<FileName>timer.c</FileName>
461+
<FileName>waitqueue.c</FileName>
455462
<FileType>1</FileType>
456-
<FilePath>..\..\..\src\timer.c</FilePath>
463+
<FilePath>..\..\..\components\drivers\src\waitqueue.c</FilePath>
457464
</File>
458-
</Files>
459-
</Group>
460-
<Group>
461-
<GroupName>Applications</GroupName>
462-
<Files>
463465
<File>
464-
<FileName>main.c</FileName>
466+
<FileName>workqueue.c</FileName>
465467
<FileType>1</FileType>
466-
<FilePath>applications\main.c</FilePath>
468+
<FilePath>..\..\..\components\drivers\src\workqueue.c</FilePath>
467469
</File>
468470
</Files>
469471
</Group>
@@ -503,117 +505,97 @@
503505
</Files>
504506
</Group>
505507
<Group>
506-
<GroupName>cpu</GroupName>
508+
<GroupName>finsh</GroupName>
507509
<Files>
508510
<File>
509-
<FileName>backtrace.c</FileName>
510-
<FileType>1</FileType>
511-
<FilePath>..\..\..\libcpu\arm\common\backtrace.c</FilePath>
512-
</File>
513-
<File>
514-
<FileName>div0.c</FileName>
511+
<FileName>shell.c</FileName>
515512
<FileType>1</FileType>
516-
<FilePath>..\..\..\libcpu\arm\common\div0.c</FilePath>
513+
<FilePath>..\..\..\components\finsh\shell.c</FilePath>
517514
</File>
518515
<File>
519-
<FileName>showmem.c</FileName>
516+
<FileName>cmd.c</FileName>
520517
<FileType>1</FileType>
521-
<FilePath>..\..\..\libcpu\arm\common\showmem.c</FilePath>
518+
<FilePath>..\..\..\components\finsh\cmd.c</FilePath>
522519
</File>
523520
<File>
524-
<FileName>cpuport.c</FileName>
521+
<FileName>msh.c</FileName>
525522
<FileType>1</FileType>
526-
<FilePath>..\..\..\libcpu\arm\cortex-m3\cpuport.c</FilePath>
527-
</File>
528-
<File>
529-
<FileName>context_rvds.S</FileName>
530-
<FileType>2</FileType>
531-
<FilePath>..\..\..\libcpu\arm\cortex-m3\context_rvds.S</FilePath>
523+
<FilePath>..\..\..\components\finsh\msh.c</FilePath>
532524
</File>
533525
</Files>
534526
</Group>
535527
<Group>
536-
<GroupName>DeviceDrivers</GroupName>
528+
<GroupName>Kernel</GroupName>
537529
<Files>
538530
<File>
539-
<FileName>pin.c</FileName>
540-
<FileType>1</FileType>
541-
<FilePath>..\..\..\components\drivers\misc\pin.c</FilePath>
542-
</File>
543-
<File>
544-
<FileName>serial.c</FileName>
531+
<FileName>clock.c</FileName>
545532
<FileType>1</FileType>
546-
<FilePath>..\..\..\components\drivers\serial\serial.c</FilePath>
533+
<FilePath>..\..\..\src\clock.c</FilePath>
547534
</File>
548535
<File>
549-
<FileName>completion.c</FileName>
536+
<FileName>components.c</FileName>
550537
<FileType>1</FileType>
551-
<FilePath>..\..\..\components\drivers\src\completion.c</FilePath>
538+
<FilePath>..\..\..\src\components.c</FilePath>
552539
</File>
553540
<File>
554-
<FileName>dataqueue.c</FileName>
541+
<FileName>device.c</FileName>
555542
<FileType>1</FileType>
556-
<FilePath>..\..\..\components\drivers\src\dataqueue.c</FilePath>
543+
<FilePath>..\..\..\src\device.c</FilePath>
557544
</File>
558545
<File>
559-
<FileName>pipe.c</FileName>
546+
<FileName>idle.c</FileName>
560547
<FileType>1</FileType>
561-
<FilePath>..\..\..\components\drivers\src\pipe.c</FilePath>
548+
<FilePath>..\..\..\src\idle.c</FilePath>
562549
</File>
563550
<File>
564-
<FileName>ringblk_buf.c</FileName>
551+
<FileName>ipc.c</FileName>
565552
<FileType>1</FileType>
566-
<FilePath>..\..\..\components\drivers\src\ringblk_buf.c</FilePath>
553+
<FilePath>..\..\..\src\ipc.c</FilePath>
567554
</File>
568555
<File>
569-
<FileName>ringbuffer.c</FileName>
556+
<FileName>irq.c</FileName>
570557
<FileType>1</FileType>
571-
<FilePath>..\..\..\components\drivers\src\ringbuffer.c</FilePath>
558+
<FilePath>..\..\..\src\irq.c</FilePath>
572559
</File>
573560
<File>
574-
<FileName>waitqueue.c</FileName>
561+
<FileName>kservice.c</FileName>
575562
<FileType>1</FileType>
576-
<FilePath>..\..\..\components\drivers\src\waitqueue.c</FilePath>
563+
<FilePath>..\..\..\src\kservice.c</FilePath>
577564
</File>
578565
<File>
579-
<FileName>workqueue.c</FileName>
566+
<FileName>mem.c</FileName>
580567
<FileType>1</FileType>
581-
<FilePath>..\..\..\components\drivers\src\workqueue.c</FilePath>
568+
<FilePath>..\..\..\src\mem.c</FilePath>
582569
</File>
583-
</Files>
584-
</Group>
585-
<Group>
586-
<GroupName>finsh</GroupName>
587-
<Files>
588570
<File>
589-
<FileName>shell.c</FileName>
571+
<FileName>mempool.c</FileName>
590572
<FileType>1</FileType>
591-
<FilePath>..\..\..\components\finsh\shell.c</FilePath>
573+
<FilePath>..\..\..\src\mempool.c</FilePath>
592574
</File>
593575
<File>
594-
<FileName>symbol.c</FileName>
576+
<FileName>object.c</FileName>
595577
<FileType>1</FileType>
596-
<FilePath>..\..\..\components\finsh\symbol.c</FilePath>
578+
<FilePath>..\..\..\src\object.c</FilePath>
597579
</File>
598580
<File>
599-
<FileName>cmd.c</FileName>
581+
<FileName>scheduler.c</FileName>
600582
<FileType>1</FileType>
601-
<FilePath>..\..\..\components\finsh\cmd.c</FilePath>
583+
<FilePath>..\..\..\src\scheduler.c</FilePath>
602584
</File>
603585
<File>
604-
<FileName>msh.c</FileName>
586+
<FileName>signal.c</FileName>
605587
<FileType>1</FileType>
606-
<FilePath>..\..\..\components\finsh\msh.c</FilePath>
588+
<FilePath>..\..\..\src\signal.c</FilePath>
607589
</File>
608590
<File>
609-
<FileName>msh_cmd.c</FileName>
591+
<FileName>thread.c</FileName>
610592
<FileType>1</FileType>
611-
<FilePath>..\..\..\components\finsh\msh_cmd.c</FilePath>
593+
<FilePath>..\..\..\src\thread.c</FilePath>
612594
</File>
613595
<File>
614-
<FileName>msh_file.c</FileName>
596+
<FileName>timer.c</FileName>
615597
<FileType>1</FileType>
616-
<FilePath>..\..\..\components\finsh\msh_file.c</FilePath>
598+
<FilePath>..\..\..\src\timer.c</FilePath>
617599
</File>
618600
</Files>
619601
</Group>
@@ -665,11 +647,6 @@
665647
<FileType>1</FileType>
666648
<FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_cec.c</FilePath>
667649
</File>
668-
<File>
669-
<FileName>stm32f1xx_hal_sram.c</FileName>
670-
<FileType>1</FileType>
671-
<FilePath>..\libraries\STM32F1xx_HAL\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_sram.c</FilePath>
672-
</File>
673650
<File>
674651
<FileName>stm32f1xx_hal_gpio.c</FileName>
675652
<FileType>1</FileType>

0 commit comments

Comments
 (0)