diff --git a/bsp/stm32f107/project.uvproj b/bsp/stm32f107/project.uvproj
index 4459183e71059fbd5a3f16f8a910f8b3d9695ba7..2f84f1db066a138bb5d1d5d18b94717ce9ecad28 100644
--- a/bsp/stm32f107/project.uvproj
+++ b/bsp/stm32f107/project.uvproj
@@ -40,14 +40,14 @@
0
1
- .\build\
+ .\obj\
rtthread-stm32
1
0
0
1
0
- .\build\
+ .\
1
0
0
@@ -68,9 +68,9 @@
0
- 1
+ 0
0
- fromelf --bin !L --output rtthread.bin
+
0
0
diff --git a/bsp/stm32f107/template.uvproj b/bsp/stm32f107/template.uvproj
index c43b9e50c22da5684401b3c0ad56070a20f510e7..30527feeb76ec1d25eb632a78c130ae640b32c24 100644
--- a/bsp/stm32f107/template.uvproj
+++ b/bsp/stm32f107/template.uvproj
@@ -43,14 +43,14 @@
0
1
- .\build\
+ .\obj\
rtthread-stm32
1
0
0
1
0
- .\build\
+ .\
1
0
0
@@ -71,9 +71,9 @@
0
- 1
+ 0
0
- fromelf --bin !L --output rtthread.bin
+
0
0
diff --git a/bsp/stm32f10x/project.Uv2 b/bsp/stm32f10x/project.Uv2
index 6f9f30a436d63e8e4ddc4d584c8e7f7151115f01..b7d07cbd308a9b6bd0a4aa62c5282b5c1cce619e 100644
--- a/bsp/stm32f10x/project.Uv2
+++ b/bsp/stm32f10x/project.Uv2
@@ -24,6 +24,7 @@ File 2,1,<..\..\src\ipc.c>
File 2,1,<..\..\src\irq.c>
File 2,1,<..\..\src\kservice.c>
File 2,1,<..\..\src\mem.c>
+File 2,1,<..\..\src\memheap.c>
File 2,1,<..\..\src\mempool.c>
File 2,1,<..\..\src\object.c>
File 2,1,<..\..\src\scheduler.c>
@@ -47,6 +48,7 @@ File 4,1,<..\..\components\finsh\finsh_var.c>
File 4,1,<..\..\components\finsh\finsh_vm.c>
File 4,1,<..\..\components\finsh\shell.c>
File 4,1,<..\..\components\finsh\symbol.c>
+File 5,1,
File 5,1,
File 5,1,
File 5,1,
@@ -74,6 +76,8 @@ File 5,1,
File 5,2,
+
+
Options 1,0,0 // Target 'RT-Thread STM32'
Device (STM32F103ZE)
Vendor (STMicroelectronics)
@@ -99,18 +103,18 @@ Options 1,0,0 // Target 'RT-Thread STM32'
EnvReg (˙ST\STM32F10x\)
OrgReg (˙ST\STM32F10x\)
TgStat=16
- OutDir (.\build\)
+ OutDir (.\obj\)
OutName (rtthread-stm32)
GenApp=1
GenLib=0
GenHex=0
Debug=1
Browse=0
- LstDir (.\build\)
+ LstDir (.\)
HexSel=1
MG32K=0
TGMORE=0
- RunUsr 0 1
+ RunUsr 0 0 <>
RunUsr 1 0 <>
BrunUsr 0 0 <>
BrunUsr 1 0 <>
@@ -132,7 +136,7 @@ Options 1,0,0 // Target 'RT-Thread STM32'
ADSCMISC ()
ADSCDEFN (STM32F10X_HD, USE_STDPERIPH_DRIVER)
ADSCUDEF ()
- 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)
+ 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)
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 49db4916577a216708e7f2c8ca820e60d7ef24da..86d802dee3dc9434f80039134f542b939b73a4aa 100644
--- a/bsp/stm32f10x/template.Uv2
+++ b/bsp/stm32f10x/template.Uv2
@@ -31,18 +31,18 @@ Options 1,0,0 // Target 'RT-Thread STM32'
EnvReg (˙ST\STM32F10x\)
OrgReg (˙ST\STM32F10x\)
TgStat=16
- OutDir (.\build\)
+ OutDir (.\obj\)
OutName (rtthread-stm32)
GenApp=1
GenLib=0
GenHex=0
Debug=1
Browse=0
- LstDir (.\build\)
+ LstDir (.\)
HexSel=1
MG32K=0
TGMORE=0
- RunUsr 0 1
+ RunUsr 0 0 <>
RunUsr 1 0 <>
BrunUsr 0 0 <>
BrunUsr 1 0 <>
diff --git a/bsp/stm32f10x/template.uvproj b/bsp/stm32f10x/template.uvproj
index d92b75b400940142b23422bbe7cbb24d4e89c4b2..e37f1f1c6f9fd684935d3c18f5eb7b07c217c06f 100644
--- a/bsp/stm32f10x/template.uvproj
+++ b/bsp/stm32f10x/template.uvproj
@@ -43,14 +43,14 @@
0
1
- .\build\
+ .\obj\
rtthread-stm32
1
0
0
1
1
- .\build\
+ .\obj\
1
0
0
@@ -71,9 +71,9 @@
0
- 1
+ 0
0
- fromelf --bin !L --output rtthread.bin
+
0
0
diff --git a/bsp/stm32f20x/applications/startup.c b/bsp/stm32f20x/applications/startup.c
index dd9969168d78a2cdfdd3d38b116ebbc33472a3fe..15879299aaa3d91f9a07f789f3948510bc1205fe 100644
--- a/bsp/stm32f20x/applications/startup.c
+++ b/bsp/stm32f20x/applications/startup.c
@@ -137,6 +137,9 @@ int main(void)
/* disable interrupt first */
rt_hw_interrupt_disable();
+ /* init system setting */
+ SystemInit();
+
/* startup RT-Thread RTOS */
rtthread_startup();
diff --git a/bsp/stm32f20x/project.uvproj b/bsp/stm32f20x/project.uvproj
index 96322bfc5756967d9e12e20dcb0fa2f1a4a73a86..bbdc001193b45d4e2365bd495e4a9f98977d0ddb 100644
--- a/bsp/stm32f20x/project.uvproj
+++ b/bsp/stm32f20x/project.uvproj
@@ -40,14 +40,14 @@
0
1
- .\build\
+ .\obj\
rtthread-stm32
1
0
0
1
0
- .\build\
+ .\obj\
1
0
0
@@ -68,9 +68,9 @@
0
- 1
+ 0
0
- fromelf --bin !L --output rtthread.bin
+
0
0
@@ -343,7 +343,7 @@
USE_STDPERIPH_DRIVER
- .;..\..\components\CMSIS\Include;..\..\components\finsh;..\..\include;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;Drivers;Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F2xx;Libraries\STM32F2xx_StdPeriph_Driver\inc;applications
+ .;..\..\components\finsh;..\..\include;..\..\libcpu\arm\common;..\..\libcpu\arm\cortex-m3;Libraries\CMSIS\CM3\CoreSupport;Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F2xx;Libraries\STM32F2xx_StdPeriph_Driver\inc;applications;drivers
@@ -458,6 +458,13 @@
STM32_StdPeriph
+
+
+ core_cm3.c
+ 1
+ Libraries\CMSIS\CM3\CoreSupport\core_cm3.c
+
+
system_stm32f2xx.c
@@ -741,6 +748,13 @@
..\..\src\mem.c
+
+
+ memheap.c
+ 1
+ ..\..\src\memheap.c
+
+
mempool.c
diff --git a/bsp/stm32f20x/template.uvproj b/bsp/stm32f20x/template.uvproj
index 79c48c556f434319b3e25f3ccda1840e124c13f9..ce16bc94f2d7662e6a2c0338409de795f47d8ca8 100644
--- a/bsp/stm32f20x/template.uvproj
+++ b/bsp/stm32f20x/template.uvproj
@@ -43,14 +43,14 @@
0
1
- .\build\
+ .\obj\
rtthread-stm32
1
0
0
1
0
- .\build\
+ .\obj\
1
0
0
@@ -71,9 +71,9 @@
0
- 1
+ 0
0
- fromelf --bin !L --output rtthread.bin
+
0
0
diff --git a/bsp/stm32f40x/project.uvproj b/bsp/stm32f40x/project.uvproj
index a2734d98afb7ee507644e29c1f4b160b79d27563..40ea3f863138e4e1a8e0badc95d22b97d1c204da 100644
--- a/bsp/stm32f40x/project.uvproj
+++ b/bsp/stm32f40x/project.uvproj
@@ -68,9 +68,9 @@
0
- 1
+ 0
0
- fromelf --bin !L --output rtthread.bin
+
0
0
@@ -713,6 +713,13 @@
..\..\src\mem.c
+
+
+ memheap.c
+ 1
+ ..\..\src\memheap.c
+
+
mempool.c
diff --git a/bsp/stm32f40x/template.uvproj b/bsp/stm32f40x/template.uvproj
index 1cee2eecb2d1ebffd6e6e2620f2afe06b8dad693..9d416799e828b84bca68018b74e57b27c9989337 100644
--- a/bsp/stm32f40x/template.uvproj
+++ b/bsp/stm32f40x/template.uvproj
@@ -71,9 +71,9 @@
0
- 1
+ 0
0
- fromelf --bin !L --output rtthread.bin
+
0
0