Merge pull request #1995 from ErnestChen1/master

[avoid] "load" icon missing in keil 5

Merge pull request #1995 from ErnestChen1/master
[avoid] "load" icon missing in keil 5
8206a5dd · Bernard Xiong · GitHub · 6445328a · e23614b7 · 8206a5dd
显示空白变更内容
内联并排

Showing with 372 addition and 374 deletion

bsp/stm32f40x/template.uvprojx bsp/stm32f40x/template.uvprojx +372 -374

未找到文件。
--- a/bsp/stm32f40x/template.uvprojx
+++ b/bsp/stm32f40x/template.uvprojx
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">

-  <SchemaVersion>1.1</SchemaVersion>
+  <SchemaVersion>2.1</SchemaVersion>

  <Header>### uVision Project, (C) Keil Software</Header>

@@ -10,13 +10,15 @@
      <TargetName>rt-thread_stm32f4xx</TargetName>
      <ToolsetNumber>0x4</ToolsetNumber>
      <ToolsetName>ARM-ADS</ToolsetName>
+      <pCCUsed>5060528::V5.06 update 5 (build 528)::ARMCC</pCCUsed>
+      <uAC6>0</uAC6>
      <TargetOption>
        <TargetCommonOption>
-	  <Device>STM32F407VG</Device>
+          <Device>STM32F407VGTx</Device>
          <Vendor>STMicroelectronics</Vendor>
-	  <PackID>Keil.STM32F4xx_DFP.2.2.0</PackID>
+          <PackID>Keil.STM32F4xx_DFP.2.13.0</PackID>
          <PackURL>http://www.keil.com/pack</PackURL>
-	  <Cpu>IROM(0x08000000,0x100000) IRAM(0x20000000,0x20000) IRAM2(0x10000000,0x10000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
+          <Cpu>IRAM(0x20000000,0x00020000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE</Cpu>
          <FlashUtilSpec></FlashUtilSpec>
          <StartupFile></StartupFile>
          <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F407VGTx$CMSIS\Flash\STM32F4xx_1024.FLM))</FlashDriverDll>
@@ -37,8 +39,8 @@
          <BinPath></BinPath>
          <IncludePath></IncludePath>
          <LibPath></LibPath>
-	  <RegisterFilePath>ST\STM32F4xx\</RegisterFilePath>
-	  <DBRegisterFilePath>ST\STM32F4xx\</DBRegisterFilePath>
+          <RegisterFilePath></RegisterFilePath>
+          <DBRegisterFilePath></DBRegisterFilePath>
          <TargetStatus>
            <Error>0</Error>
            <ExitCodeStop>0</ExitCodeStop>
@@ -50,9 +52,9 @@
          <OutputName>rtthread-stm32f4xx</OutputName>
          <CreateExecutable>1</CreateExecutable>
          <CreateLib>0</CreateLib>
-	  <CreateHexFile>0</CreateHexFile>
+          <CreateHexFile>1</CreateHexFile>
          <DebugInformation>1</DebugInformation>
-	  <BrowseInformation>1</BrowseInformation>
+          <BrowseInformation>0</BrowseInformation>
          <ListingPath>.\build\</ListingPath>
          <HexFormatSelection>1</HexFormatSelection>
          <Merge32K>0</Merge32K>
@@ -64,6 +66,8 @@
            <UserProg2Name></UserProg2Name>
            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
          </BeforeCompile>
          <BeforeMake>
            <RunUserProg1>0</RunUserProg1>
@@ -72,14 +76,18 @@
            <UserProg2Name></UserProg2Name>
            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopB1X>0</nStopB1X>
+            <nStopB2X>0</nStopB2X>
          </BeforeMake>
          <AfterMake>
            <RunUserProg1>1</RunUserProg1>
            <RunUserProg2>0</RunUserProg2>
-	    <UserProg1Name>fromelf --bin !L --output rtthread.bin</UserProg1Name>
+            <UserProg1Name>fromelf --bin !L --output @H.bin</UserProg1Name>
            <UserProg2Name></UserProg2Name>
            <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
            <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopA1X>0</nStopA1X>
+            <nStopA2X>0</nStopA2X>
          </AfterMake>
          <SelectedForBatchBuild>0</SelectedForBatchBuild>
          <SVCSIdString></SVCSIdString>
@@ -98,14 +106,15 @@
          <StopOnExitCode>3</StopOnExitCode>
          <CustomArgument></CustomArgument>
          <IncludeLibraryModules></IncludeLibraryModules>
+          <ComprImg>1</ComprImg>
        </CommonProperty>
        <DllOption>
          <SimDllName>SARMCM3.DLL</SimDllName>
-	  <SimDllArguments>-MPU</SimDllArguments>
+          <SimDllArguments> -REMAP -MPU</SimDllArguments>
          <SimDlgDll>DCM.DLL</SimDlgDll>
          <SimDlgDllArguments>-pCM4</SimDlgDllArguments>
          <TargetDllName>SARMCM3.DLL</TargetDllName>
-	  <TargetDllArguments>-MPU</TargetDllArguments>
+          <TargetDllArguments> -MPU</TargetDllArguments>
          <TargetDlgDll>TCM.DLL</TargetDlgDll>
          <TargetDlgDllArguments>-pCM4</TargetDlgDllArguments>
        </DllOption>
@@ -117,44 +126,6 @@
            <HexOffset>0</HexOffset>
            <Oh166RecLen>16</Oh166RecLen>
          </OPTHX>
-	  <Simulator>
-	    <UseSimulator>0</UseSimulator>
-	    <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
-	    <RunToMain>1</RunToMain>
-	    <RestoreBreakpoints>1</RestoreBreakpoints>
-	    <RestoreWatchpoints>1</RestoreWatchpoints>
-	    <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
-	    <RestoreFunctions>1</RestoreFunctions>
-	    <RestoreToolbox>1</RestoreToolbox>
-	    <LimitSpeedToRealTime>0</LimitSpeedToRealTime>
-	  </Simulator>
-	  <Target>
-	    <UseTarget>1</UseTarget>
-	    <LoadApplicationAtStartup>1</LoadApplicationAtStartup>
-	    <RunToMain>1</RunToMain>
-	    <RestoreBreakpoints>1</RestoreBreakpoints>
-	    <RestoreWatchpoints>1</RestoreWatchpoints>
-	    <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
-	    <RestoreFunctions>0</RestoreFunctions>
-	    <RestoreToolbox>1</RestoreToolbox>
-	  </Target>
-	  <RunDebugAfterBuild>0</RunDebugAfterBuild>
-	  <TargetSelection>8</TargetSelection>
-	  <SimDlls>
-	    <CpuDll></CpuDll>
-	    <CpuDllArguments></CpuDllArguments>
-	    <PeripheralDll></PeripheralDll>
-	    <PeripheralDllArguments></PeripheralDllArguments>
-	    <InitializationFile></InitializationFile>
-	  </SimDlls>
-	  <TargetDlls>
-	    <CpuDll></CpuDll>
-	    <CpuDllArguments></CpuDllArguments>
-	    <PeripheralDll></PeripheralDll>
-	    <PeripheralDllArguments></PeripheralDllArguments>
-	    <InitializationFile></InitializationFile>
-	    <Driver>STLink\ST-LINKIII-KEIL.dll</Driver>
-	  </TargetDlls>
        </DebugOption>
        <Utilities>
          <Flash1>
@@ -163,11 +134,16 @@
            <RunIndependent>0</RunIndependent>
            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
            <Capability>1</Capability>
-	    <DriverSelection>4100</DriverSelection>
+            <DriverSelection>4096</DriverSelection>
          </Flash1>
-	  <Flash2>STLink\ST-LINKIII-KEIL.dll</Flash2>
-	  <Flash3>"" ()</Flash3>
+          <bUseTDR>1</bUseTDR>
+          <Flash2>BIN\UL2CM3.DLL</Flash2>
+          <Flash3></Flash3>
          <Flash4></Flash4>
+          <pFcarmOut></pFcarmOut>
+          <pFcarmGrp></pFcarmGrp>
+          <pFcArmRoot></pFcArmRoot>
+          <FcArmLst>0</FcArmLst>
        </Utilities>
        <TargetArmAds>
          <ArmAdsMisc>
@@ -214,8 +190,9 @@
            <useUlib>0</useUlib>
            <EndSel>0</EndSel>
            <uLtcg>0</uLtcg>
+            <nSecure>0</nSecure>
            <RoSelD>3</RoSelD>
-	    <RwSelD>3</RwSelD>
+            <RwSelD>4</RwSelD>
            <CodeSel>0</CodeSel>
            <OptFeed>0</OptFeed>
            <NoZi1>0</NoZi1>
@@ -345,6 +322,17 @@
            <Rwpi>0</Rwpi>
            <wLevel>0</wLevel>
            <uThumb>0</uThumb>
+            <uSurpInc>0</uSurpInc>
+            <uC99>0</uC99>
+            <uGnu>0</uGnu>
+            <useXO>0</useXO>
+            <v6Lang>0</v6Lang>
+            <v6LangP>0</v6LangP>
+            <vShortEn>0</vShortEn>
+            <vShortWch>0</vShortWch>
+            <v6Lto>0</v6Lto>
+            <v6WtE>0</v6WtE>
+            <v6Rtti>0</v6Rtti>
            <VariousControls>
              <MiscControls></MiscControls>
              <Define></Define>
@@ -360,6 +348,9 @@
            <SplitLS>0</SplitLS>
            <SwStkChk>0</SwStkChk>
            <NoWarn>0</NoWarn>
+            <uSurpInc>0</uSurpInc>
+            <useXO>0</useXO>
+            <uClangAs>0</uClangAs>
            <VariousControls>
              <MiscControls></MiscControls>
              <Define></Define>
@@ -368,7 +359,7 @@
            </VariousControls>
          </Aads>
          <LDads>
-	    <umfTarg>1</umfTarg>
+            <umfTarg>0</umfTarg>
            <Ropi>0</Ropi>
            <Rwpi>0</Rwpi>
            <noStLib>0</noStLib>
@@ -376,7 +367,8 @@
            <useFile>0</useFile>
            <TextAddressRange>0x08000000</TextAddressRange>
            <DataAddressRange>0x20000000</DataAddressRange>
-	    <ScatterFile></ScatterFile>
+            <pXoBase></pXoBase>
+            <ScatterFile>.\stm32_rom.sct</ScatterFile>
            <IncludeLibs></IncludeLibs>
            <IncludeLibsPath></IncludeLibsPath>
            <Misc></Misc>
@@ -388,4 +380,10 @@
    </Target>
  </Targets>

+  <RTE>
+    <apis/>
+    <components/>
+    <files/>
+  </RTE>
+
 </Project>