From e3a4ae1370c21e93d471073e1b78e42b16e4fd8c Mon Sep 17 00:00:00 2001
From: aozima <wuyangyong@gmail.com>
Date: Wed, 20 Feb 2013 10:15:09 +0800
Subject: [PATCH] update stm32f10x template.

---
 bsp/stm32f10x/project.Uv2     | 10 +++-------
 bsp/stm32f10x/template.Uv2    |  4 ++--
 bsp/stm32f10x/template.uvproj |  4 ++--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/bsp/stm32f10x/project.Uv2 b/bsp/stm32f10x/project.Uv2
index b7d07cbd30..19c1fcd32c 100644
--- a/bsp/stm32f10x/project.Uv2
+++ b/bsp/stm32f10x/project.Uv2
@@ -24,7 +24,6 @@ File 2,1,<..\..\src\ipc.c><ipc.c>
 File 2,1,<..\..\src\irq.c><irq.c>
 File 2,1,<..\..\src\kservice.c><kservice.c>
 File 2,1,<..\..\src\mem.c><mem.c>
-File 2,1,<..\..\src\memheap.c><memheap.c>
 File 2,1,<..\..\src\mempool.c><mempool.c>
 File 2,1,<..\..\src\object.c><object.c>
 File 2,1,<..\..\src\scheduler.c><scheduler.c>
@@ -48,7 +47,6 @@ File 4,1,<..\..\components\finsh\finsh_var.c><finsh_var.c>
 File 4,1,<..\..\components\finsh\finsh_vm.c><finsh_vm.c>
 File 4,1,<..\..\components\finsh\shell.c><shell.c>
 File 4,1,<..\..\components\finsh\symbol.c><symbol.c>
-File 5,1,<Libraries\CMSIS\CM3\CoreSupport\core_cm3.c><core_cm3.c>
 File 5,1,<Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c><system_stm32f10x.c>
 File 5,1,<Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c><stm32f10x_crc.c>
 File 5,1,<Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c><stm32f10x_rcc.c>
@@ -76,8 +74,6 @@ File 5,1,<Libraries\STM32F10x_StdPeriph_Driver\src\misc.c><misc.c>
 File 5,2,<Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x\startup\arm\startup_stm32f10x_hd.s><startup_stm32f10x_hd.s>
 
 
-
-
 Options 1,0,0  // Target 'RT-Thread STM32'
  Device (STM32F103ZE)
  Vendor (STMicroelectronics)
@@ -103,14 +99,14 @@ Options 1,0,0  // Target 'RT-Thread STM32'
  EnvReg (˙ST\STM32F10x\)
  OrgReg (˙ST\STM32F10x\)
  TgStat=16
- OutDir (.\obj\)
+ OutDir (.\build\)
  OutName (rtthread-stm32)
  GenApp=1
  GenLib=0
  GenHex=0
  Debug=1
  Browse=0
- LstDir (.\)
+ LstDir (.\build\)
  HexSel=1
  MG32K=0
  TGMORE=0
@@ -136,7 +132,7 @@ Options 1,0,0  // Target 'RT-Thread STM32'
  ADSCMISC ()
  ADSCDEFN (STM32F10X_HD, USE_STDPERIPH_DRIVER)
  ADSCUDEF ()
- ADSCINCD (Libraries\STM32F10x_StdPeriph_Driver\inc;.;..\..\include;Libraries\CMSIS\CM3\CoreSupport;..\..\libcpu\arm\cortex-m3;..\..\libcpu\arm\common;..\..\components\finsh;Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x)
+ ADSCINCD (Libraries\STM32F10x_StdPeriph_Driver\inc;..\..\components\CMSIS\Include;.;..\..\include;..\..\libcpu\arm\cortex-m3;..\..\libcpu\arm\common;..\..\components\finsh;Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x)
  ADSASFLG { 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
  ADSAMISC ()
  ADSADEFN ()
diff --git a/bsp/stm32f10x/template.Uv2 b/bsp/stm32f10x/template.Uv2
index 86d802dee3..c72c12b7e5 100644
--- a/bsp/stm32f10x/template.Uv2
+++ b/bsp/stm32f10x/template.Uv2
@@ -31,14 +31,14 @@ Options 1,0,0  // Target 'RT-Thread STM32'
  EnvReg (˙ST\STM32F10x\)
  OrgReg (˙ST\STM32F10x\)
  TgStat=16
- OutDir (.\obj\)
+ OutDir (.\build\)
  OutName (rtthread-stm32)
  GenApp=1
  GenLib=0
  GenHex=0
  Debug=1
  Browse=0
- LstDir (.\)
+ LstDir (.\build\)
  HexSel=1
  MG32K=0
  TGMORE=0
diff --git a/bsp/stm32f10x/template.uvproj b/bsp/stm32f10x/template.uvproj
index e37f1f1c6f..9ac75907f8 100644
--- a/bsp/stm32f10x/template.uvproj
+++ b/bsp/stm32f10x/template.uvproj
@@ -43,14 +43,14 @@
             <NotGenerated>0</NotGenerated>
             <InvalidFlash>1</InvalidFlash>
           </TargetStatus>
-          <OutputDirectory>.\obj\</OutputDirectory>
+          <OutputDirectory>.\build\</OutputDirectory>
           <OutputName>rtthread-stm32</OutputName>
           <CreateExecutable>1</CreateExecutable>
           <CreateLib>0</CreateLib>
           <CreateHexFile>0</CreateHexFile>
           <DebugInformation>1</DebugInformation>
           <BrowseInformation>1</BrowseInformation>
-          <ListingPath>.\obj\</ListingPath>
+          <ListingPath>.\build\</ListingPath>
           <HexFormatSelection>1</HexFormatSelection>
           <Merge32K>0</Merge32K>
           <CreateBatchFile>0</CreateBatchFile>