diff options
| author | Bernard Xiong <[email protected]> | 2015-04-03 22:30:16 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2015-04-03 22:30:16 +0800 |
| commit | 2bc4386c30768a320b805cb74bb44972dc10dbbc (patch) | |
| tree | 056da1e20ab25c68112f0c6bf59479abfce1c6a6 | |
| parent | 40db28cfeca76f4d4dc398741012284a498e963c (diff) | |
| parent | d4ec1ed5f97b25513c67b319ce4e085871465f4f (diff) | |
Merge pull request #446 from heyuanjie87/master
[bsp]stm32f107/.uvprojx:fix mcu type error
| -rw-r--r-- | bsp/stm32f107/project.uvprojx | 14 | ||||
| -rw-r--r-- | bsp/stm32f107/template.uvprojx | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/bsp/stm32f107/project.uvprojx b/bsp/stm32f107/project.uvprojx index 2b8177c5f4..636a0311fe 100644 --- a/bsp/stm32f107/project.uvprojx +++ b/bsp/stm32f107/project.uvprojx @@ -14,9 +14,7 @@ <TargetCommonOption> <Device>STM32F107VC</Device> <Vendor>STMicroelectronics</Vendor> - <PackID>Keil.STM32F1xx_DFP.1.0.5</PackID> - <PackURL>http://www.keil.com/pack/</PackURL> - <Cpu>IROM(0x08000000,0x10000) IRAM(0x20000000,0x2000) CPUTYPE("Cortex-M0") CLOCK(12000000) ELITTLE</Cpu> + <Cpu>IROM(0x08000000,0x10000) IRAM(0x20000000,0x2000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu> <FlashUtilSpec></FlashUtilSpec> <StartupFile></StartupFile> <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F0xx_64 -FS08000000 -FL010000 -FP0($$Device:STM32F051R8$Flash\STM32F0xx_64.FLM))</FlashDriverDll> @@ -74,8 +72,6 @@ <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> - <nStopB1X>0</nStopB1X> - <nStopB2X>0</nStopB2X> </BeforeMake> <AfterMake> <RunUserProg1>1</RunUserProg1> @@ -132,7 +128,6 @@ <RestoreFunctions>1</RestoreFunctions> <RestoreToolbox>1</RestoreToolbox> <LimitSpeedToRealTime>0</LimitSpeedToRealTime> - <RestoreSysVw>1</RestoreSysVw> </Simulator> <Target> <UseTarget>1</UseTarget> @@ -144,10 +139,11 @@ <RestoreFunctions>0</RestoreFunctions> <RestoreToolbox>1</RestoreToolbox> <RestoreTracepoints>0</RestoreTracepoints> - <RestoreSysVw>1</RestoreSysVw> + <RestoreTracepoints>1</RestoreTracepoints> + <RestoreTracepoints>1</RestoreTracepoints> </Target> <RunDebugAfterBuild>0</RunDebugAfterBuild> - <TargetSelection>6</TargetSelection> + <TargetSelection>7</TargetSelection> <SimDlls> <CpuDll></CpuDll> <CpuDllArguments></CpuDllArguments> @@ -211,7 +207,7 @@ <AdsLsxf>1</AdsLsxf> <RvctClst>0</RvctClst> <GenPPlst>0</GenPPlst> - <AdsCpuType>"Cortex-M0"</AdsCpuType> + <AdsCpuType>"Cortex-M3"</AdsCpuType> <RvctDeviceName></RvctDeviceName> <mOS>0</mOS> <uocRom>0</uocRom> diff --git a/bsp/stm32f107/template.uvprojx b/bsp/stm32f107/template.uvprojx index a90b887b3b..c90012b8b5 100644 --- a/bsp/stm32f107/template.uvprojx +++ b/bsp/stm32f107/template.uvprojx @@ -16,7 +16,7 @@ <Vendor>STMicroelectronics</Vendor> <PackID>Keil.STM32F0xx_DFP.1.2.0</PackID> <PackURL>http://www.keil.com/pack/</PackURL> - <Cpu>IROM(0x08000000,0x10000) IRAM(0x20000000,0x2000) CPUTYPE("Cortex-M0") CLOCK(12000000) ELITTLE</Cpu> + <Cpu>IROM(0x08000000,0x10000) IRAM(0x20000000,0x2000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu> <FlashUtilSpec></FlashUtilSpec> <StartupFile></StartupFile> <FlashDriverDll>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F0xx_64 -FS08000000 -FL010000 -FP0($$Device:STM32F051R8$Flash\STM32F0xx_64.FLM))</FlashDriverDll> |