From 192f00dbc80d19568cba506cc5545c9f9f3b90ea Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Tue, 13 Nov 2018 17:36:16 +0800
Subject: [PATCH] Update STM32L bare test project from MDK4 to MDK5.26
---
src/STM32L_BareTest/STM32L_BareTest.uvprojx | 168 ++++++++++++++++++++++++++++----------------------------
1 files changed, 84 insertions(+), 84 deletions(-)
diff --git a/src/STM32L_BareTest/stm32L_bare.uvproj b/src/STM32L_BareTest/STM32L_BareTest.uvprojx
similarity index 84%
rename from src/STM32L_BareTest/stm32L_bare.uvproj
rename to src/STM32L_BareTest/STM32L_BareTest.uvprojx
index 3f96893..1c584b5 100644
--- a/src/STM32L_BareTest/stm32L_bare.uvproj
+++ b/src/STM32L_BareTest/STM32L_BareTest.uvprojx
@@ -1,25 +1,29 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_proj.xsd">
+<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>
<Targets>
<Target>
- <TargetName>stm32l_bare</TargetName>
+ <TargetName>STM32L_BareTest</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
+ <pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
+ <uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
- <Device>STM32L151V8</Device>
+ <Device>STM32L151C8xxA</Device>
<Vendor>STMicroelectronics</Vendor>
- <Cpu>IRAM(0x20000000-0x200027FF) IROM(0x8000000-0x800FFFF) CLOCK(8000000) CPUTYPE("Cortex-M3")</Cpu>
+ <PackID>Keil.STM32L1xx_DFP.1.2.0</PackID>
+ <PackURL>http://www.keil.com/pack/</PackURL>
+ <Cpu>IRAM(0x20000000,0x00008000) IROM(0x08000000,0x00010000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
- <StartupFile>"STARTUP\ST\STM32L1xx\startup_stm32l1xx_md.s" ("STM32L1xx Medium density Startup Code")</StartupFile>
- <FlashDriverDll>ULP2CM3(-O207 -S8 -C0 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32L1xx_128 -FS08000000 -FL010000)</FlashDriverDll>
- <DeviceId>5240</DeviceId>
- <RegisterFile>stm32l1xx.h</RegisterFile>
+ <StartupFile></StartupFile>
+ <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32L1xx_128 -FS08000000 -FL010000 -FP0($$Device:STM32L151C8xxA$Flash\STM32L1xx_128.FLM))</FlashDriverDll>
+ <DeviceId>0</DeviceId>
+ <RegisterFile>$$Device:STM32L151C8xxA$Device\Include\stm32l1xx.h</RegisterFile>
<MemoryEnv></MemoryEnv>
<Cmp></Cmp>
<Asm></Asm>
@@ -29,13 +33,14 @@
<SLE66CMisc></SLE66CMisc>
<SLE66AMisc></SLE66AMisc>
<SLE66LinkerMisc></SLE66LinkerMisc>
- <SFDFile>SFD\ST\STM32L15x\STM32L15x.sfr</SFDFile>
+ <SFDFile>$$Device:STM32L151C8xxA$SVD\STM32L15xxxA.svd</SFDFile>
+ <bCustSvd>0</bCustSvd>
<UseEnv>0</UseEnv>
<BinPath></BinPath>
<IncludePath></IncludePath>
<LibPath></LibPath>
- <RegisterFilePath>ST\STM32L1xx\</RegisterFilePath>
- <DBRegisterFilePath>ST\STM32L1xx\</DBRegisterFilePath>
+ <RegisterFilePath></RegisterFilePath>
+ <DBRegisterFilePath></DBRegisterFilePath>
<TargetStatus>
<Error>0</Error>
<ExitCodeStop>0</ExitCodeStop>
@@ -44,13 +49,13 @@
<InvalidFlash>1</InvalidFlash>
</TargetStatus>
<OutputDirectory>.\output\</OutputDirectory>
- <OutputName>stm32L_bare</OutputName>
+ <OutputName>STM32L_BareTest</OutputName>
<CreateExecutable>1</CreateExecutable>
<CreateLib>0</CreateLib>
<CreateHexFile>1</CreateHexFile>
<DebugInformation>1</DebugInformation>
<BrowseInformation>1</BrowseInformation>
- <ListingPath>.\</ListingPath>
+ <ListingPath>.\Listings\</ListingPath>
<HexFormatSelection>1</HexFormatSelection>
<Merge32K>0</Merge32K>
<CreateBatchFile>0</CreateBatchFile>
@@ -71,6 +76,8 @@
<UserProg2Name></UserProg2Name>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+ <nStopB1X>0</nStopB1X>
+ <nStopB2X>0</nStopB2X>
</BeforeMake>
<AfterMake>
<RunUserProg1>0</RunUserProg1>
@@ -79,6 +86,8 @@
<UserProg2Name></UserProg2Name>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+ <nStopA1X>0</nStopA1X>
+ <nStopA2X>0</nStopA2X>
</AfterMake>
<SelectedForBatchBuild>0</SelectedForBatchBuild>
<SVCSIdString></SVCSIdString>
@@ -97,14 +106,15 @@
<StopOnExitCode>3</StopOnExitCode>
<CustomArgument></CustomArgument>
<IncludeLibraryModules></IncludeLibraryModules>
+ <ComprImg>1</ComprImg>
</CommonProperty>
<DllOption>
<SimDllName>SARMCM3.DLL</SimDllName>
- <SimDllArguments>-MPU -REMAP</SimDllArguments>
+ <SimDllArguments> -REMAP -MPU</SimDllArguments>
<SimDlgDll>DCM.DLL</SimDlgDll>
<SimDlgDllArguments>-pCM3</SimDlgDllArguments>
<TargetDllName>SARMCM3.DLL</TargetDllName>
- <TargetDllArguments>-MPU</TargetDllArguments>
+ <TargetDllArguments> -MPU</TargetDllArguments>
<TargetDlgDll>TCM.DLL</TargetDlgDll>
<TargetDlgDllArguments>-pCM3</TargetDlgDllArguments>
</DllOption>
@@ -116,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>0</RunToMain>
- <RestoreBreakpoints>1</RestoreBreakpoints>
- <RestoreWatchpoints>1</RestoreWatchpoints>
- <RestoreMemoryDisplay>1</RestoreMemoryDisplay>
- <RestoreFunctions>0</RestoreFunctions>
- <RestoreToolbox>1</RestoreToolbox>
- </Target>
- <RunDebugAfterBuild>0</RunDebugAfterBuild>
- <TargetSelection>13</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_SWO.dll</Driver>
- </TargetDlls>
</DebugOption>
<Utilities>
<Flash1>
@@ -162,11 +134,16 @@
<RunIndependent>0</RunIndependent>
<UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
<Capability>1</Capability>
- <DriverSelection>4104</DriverSelection>
+ <DriverSelection>4096</DriverSelection>
</Flash1>
- <Flash2>STLink\ST-LINKIII-KEIL_SWO.dll</Flash2>
+ <bUseTDR>1</bUseTDR>
+ <Flash2>BIN\UL2CM3.DLL</Flash2>
<Flash3>"" ()</Flash3>
<Flash4></Flash4>
+ <pFcarmOut></pFcarmOut>
+ <pFcarmGrp></pFcarmGrp>
+ <pFcArmRoot></pFcArmRoot>
+ <FcArmLst>0</FcArmLst>
</Utilities>
<TargetArmAds>
<ArmAdsMisc>
@@ -207,12 +184,14 @@
<hadXRAM>0</hadXRAM>
<uocXRam>0</uocXRam>
<RvdsVP>0</RvdsVP>
+ <RvdsMve>0</RvdsMve>
<hadIRAM2>0</hadIRAM2>
<hadIROM2>0</hadIROM2>
<StupSel>8</StupSel>
- <useUlib>1</useUlib>
+ <useUlib>0</useUlib>
<EndSel>0</EndSel>
<uLtcg>0</uLtcg>
+ <nSecure>0</nSecure>
<RoSelD>3</RoSelD>
<RwSelD>3</RwSelD>
<CodeSel>0</CodeSel>
@@ -266,7 +245,7 @@
<IRAM>
<Type>0</Type>
<StartAddress>0x20000000</StartAddress>
- <Size>0x2800</Size>
+ <Size>0x8000</Size>
</IRAM>
<IROM>
<Type>1</Type>
@@ -321,7 +300,7 @@
<OCR_RVCT9>
<Type>0</Type>
<StartAddress>0x20000000</StartAddress>
- <Size>0x2800</Size>
+ <Size>0x8000</Size>
</OCR_RVCT9>
<OCR_RVCT10>
<Type>0</Type>
@@ -336,19 +315,30 @@
<Optim>1</Optim>
<oTime>0</oTime>
<SplitLS>0</SplitLS>
- <OneElfS>0</OneElfS>
+ <OneElfS>1</OneElfS>
<Strict>0</Strict>
<EnumInt>0</EnumInt>
<PlainCh>0</PlainCh>
<Ropi>0</Ropi>
<Rwpi>0</Rwpi>
- <wLevel>0</wLevel>
+ <wLevel>2</wLevel>
<uThumb>0</uThumb>
+ <uSurpInc>0</uSurpInc>
+ <uC99>1</uC99>
+ <uGnu>1</uGnu>
+ <useXO>0</useXO>
+ <v6Lang>1</v6Lang>
+ <v6LangP>1</v6LangP>
+ <vShortEn>1</vShortEn>
+ <vShortWch>1</vShortWch>
+ <v6Lto>0</v6Lto>
+ <v6WtE>0</v6WtE>
+ <v6Rtti>0</v6Rtti>
<VariousControls>
<MiscControls></MiscControls>
<Define>STM32L1XX_MD,USE_STDPERIPH_DRIVER</Define>
<Undefine></Undefine>
- <IncludePath>.\board;.\cmsis;.\stdlib\inc</IncludePath>
+ <IncludePath>.\cmsis;.\stdlib\inc;.\board</IncludePath>
</VariousControls>
</Cads>
<Aads>
@@ -359,6 +349,9 @@
<SplitLS>0</SplitLS>
<SwStkChk>0</SwStkChk>
<NoWarn>0</NoWarn>
+ <uSurpInc>0</uSurpInc>
+ <useXO>0</useXO>
+ <uClangAs>0</uClangAs>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@@ -375,6 +368,7 @@
<useFile>0</useFile>
<TextAddressRange>0x08000000</TextAddressRange>
<DataAddressRange>0x20000000</DataAddressRange>
+ <pXoBase></pXoBase>
<ScatterFile></ScatterFile>
<IncludeLibs></IncludeLibs>
<IncludeLibsPath></IncludeLibsPath>
@@ -386,7 +380,22 @@
</TargetOption>
<Groups>
<Group>
- <GroupName>stdlib</GroupName>
+ <GroupName>CMSIS</GroupName>
+ <Files>
+ <File>
+ <FileName>system_stm32l1xx.c</FileName>
+ <FileType>1</FileType>
+ <FilePath>.\cmsis\system_stm32l1xx.c</FilePath>
+ </File>
+ <File>
+ <FileName>startup_stm32l1xx_md.s</FileName>
+ <FileType>2</FileType>
+ <FilePath>.\cmsis\startup_stm32l1xx_md.s</FilePath>
+ </File>
+ </Files>
+ </Group>
+ <Group>
+ <GroupName>Stdlib</GroupName>
<Files>
<File>
<FileName>misc.c</FileName>
@@ -526,23 +535,13 @@
</Files>
</Group>
<Group>
- <GroupName>cmsis</GroupName>
+ <GroupName>Board</GroupName>
<Files>
<File>
- <FileName>startup_stm32l1xx_md.s</FileName>
- <FileType>2</FileType>
- <FilePath>.\cmsis\startup_stm32l1xx_md.s</FilePath>
- </File>
- <File>
- <FileName>system_stm32l1xx.c</FileName>
+ <FileName>stm32_key.c</FileName>
<FileType>1</FileType>
- <FilePath>.\cmsis\system_stm32l1xx.c</FilePath>
+ <FilePath>.\board\stm32_key.c</FilePath>
</File>
- </Files>
- </Group>
- <Group>
- <GroupName>board</GroupName>
- <Files>
<File>
<FileName>stm32_led.c</FileName>
<FileType>1</FileType>
@@ -554,24 +553,19 @@
<FilePath>.\board\stm32_systick.c</FilePath>
</File>
<File>
- <FileName>stm32l1xx_it.c</FileName>
- <FileType>1</FileType>
- <FilePath>.\board\stm32l1xx_it.c</FilePath>
- </File>
- <File>
<FileName>stm32_usart.c</FileName>
<FileType>1</FileType>
<FilePath>.\board\stm32_usart.c</FilePath>
</File>
<File>
- <FileName>stm32_key.c</FileName>
+ <FileName>stm32l1xx_it.c</FileName>
<FileType>1</FileType>
- <FilePath>.\board\stm32_key.c</FilePath>
+ <FilePath>.\board\stm32l1xx_it.c</FilePath>
</File>
</Files>
</Group>
<Group>
- <GroupName>main</GroupName>
+ <GroupName>User</GroupName>
<Files>
<File>
<FileName>main.c</FileName>
@@ -584,4 +578,10 @@
</Target>
</Targets>
+ <RTE>
+ <apis/>
+ <components/>
+ <files/>
+ </RTE>
+
</Project>
--
Gitblit v1.9.1