Skip to content

Commit e166da9

Browse files
authored
Merge pull request #1767 from liu2guang/liuguang_ci_dev
[bsp] 修复部分bsp编译错误.
2 parents 04ea2f3 + de66213 commit e166da9

File tree

6 files changed

+955
-726
lines changed

6 files changed

+955
-726
lines changed

bsp/frdm-k64f/project.uvproj

+14-2
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272
<UserProg2Name></UserProg2Name>
7373
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
7474
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
75+
<nStopB1X>0</nStopB1X>
76+
<nStopB2X>0</nStopB2X>
7577
</BeforeMake>
7678
<AfterMake>
7779
<RunUserProg1>0</RunUserProg1>
@@ -80,6 +82,8 @@
8082
<UserProg2Name></UserProg2Name>
8183
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
8284
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
85+
<nStopA1X>0</nStopA1X>
86+
<nStopA2X>0</nStopA2X>
8387
</AfterMake>
8488
<SelectedForBatchBuild>0</SelectedForBatchBuild>
8589
<SVCSIdString></SVCSIdString>
@@ -141,10 +145,9 @@
141145
<RestoreToolbox>1</RestoreToolbox>
142146
<RestoreTracepoints>1</RestoreTracepoints>
143147
<RestoreSysVw>1</RestoreSysVw>
144-
<UsePdscDebugDescription>0</UsePdscDebugDescription>
145148
</Target>
146149
<RunDebugAfterBuild>0</RunDebugAfterBuild>
147-
<TargetSelection>6</TargetSelection>
150+
<TargetSelection>3</TargetSelection>
148151
<SimDlls>
149152
<CpuDll></CpuDll>
150153
<CpuDllArguments></CpuDllArguments>
@@ -224,6 +227,7 @@
224227
<useUlib>0</useUlib>
225228
<EndSel>0</EndSel>
226229
<uLtcg>0</uLtcg>
230+
<nSecure>0</nSecure>
227231
<RoSelD>3</RoSelD>
228232
<RwSelD>3</RwSelD>
229233
<CodeSel>0</CodeSel>
@@ -358,6 +362,13 @@
358362
<uSurpInc>0</uSurpInc>
359363
<uC99>1</uC99>
360364
<useXO>0</useXO>
365+
<v6Lang>1</v6Lang>
366+
<v6LangP>1</v6LangP>
367+
<vShortEn>1</vShortEn>
368+
<vShortWch>1</vShortWch>
369+
<v6Lto>0</v6Lto>
370+
<v6WtE>0</v6WtE>
371+
<v6Rtti>0</v6Rtti>
361372
<VariousControls>
362373
<MiscControls></MiscControls>
363374
<Define>CPU_MK64FN1M0VLL12</Define>
@@ -375,6 +386,7 @@
375386
<NoWarn>0</NoWarn>
376387
<uSurpInc>0</uSurpInc>
377388
<useXO>0</useXO>
389+
<uClangAs>0</uClangAs>
378390
<VariousControls>
379391
<MiscControls></MiscControls>
380392
<Define></Define>

0 commit comments

Comments
 (0)