update template project file.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1382 bbd45198-f89e-11dd-88c7-29a3b14d5316

2 files changed, 161 insertions, 169 deletions

diff --git a/bsp/lm3s/rtconfig.h b/bsp/lm3s/rtconfig.h
index 2373f86949..31169ea56a 100644
--- a/bsp/lm3s/rtconfig.h
+++ b/bsp/lm3s/rtconfig.h
@@ -1,161 +1,153 @@
-/* RT-Thread config file */
-#ifndef __RTTHREAD_CFG_H__
-#define __RTTHREAD_CFG_H__
-
-/* RT_NAME_MAX*/
-#define RT_NAME_MAX	8
-
-/* RT_ALIGN_SIZE*/
-#define RT_ALIGN_SIZE	4
-
-/* PRIORITY_MAX*/
-#define RT_THREAD_PRIORITY_MAX	32
-
-/* Tick per Second*/
-#define RT_TICK_PER_SECOND	100
-
-/* SECTION: RT_DEBUG */
-/* Thread Debug*/
-#define RT_DEBUG
-/* #define RT_THREAD_DEBUG */
-
-/* Using Hook*/
-#define RT_USING_HOOK
-
-/* SECTION: IPC */
-/* Using Semaphore*/
-#define RT_USING_SEMAPHORE
-
-/* Using Mutex*/
-#define RT_USING_MUTEX
-
-/* Using Event*/
-#define RT_USING_EVENT
-
-/* Using Faset Event*/
-/* #define RT_USING_FASTEVENT */
-
-/* Using MailBox*/
-#define RT_USING_MAILBOX
-
-/* Using Message Queue*/
-#define RT_USING_MESSAGEQUEUE
-
-/* SECTION: Memory Management */
-/* Using Memory Pool Management*/
-#define RT_USING_MEMPOOL
-
-/* Using Dynamic Heap Management*/
-#define RT_USING_HEAP
-
-/* Using Small MM*/
-#define RT_USING_SMALL_MEM
-
-/* Using SLAB Allocator*/
-/* #define RT_USING_SLAB */
-
-/* SECTION: Device System */
-/* Using Device System*/
-#define RT_USING_DEVICE
-
-#define RT_USING_UART1
-// #define RT_USING_UART2
-// #define RT_USING_UART3
-
+/* RT-Thread config file */

+#ifndef __RTTHREAD_CFG_H__

+#define __RTTHREAD_CFG_H__

+

+/* RT_NAME_MAX*/

+#define RT_NAME_MAX	8

+

+/* RT_ALIGN_SIZE*/

+#define RT_ALIGN_SIZE	4

+

+/* PRIORITY_MAX*/

+#define RT_THREAD_PRIORITY_MAX	32

+

+/* Tick per Second*/

+#define RT_TICK_PER_SECOND	100

+

+/* SECTION: RT_DEBUG */

+/* Thread Debug*/

+#define RT_DEBUG

+/* #define RT_THREAD_DEBUG */

+

+/* Using Hook*/

+#define RT_USING_HOOK

+

+/* SECTION: IPC */

+/* Using Semaphore*/

+#define RT_USING_SEMAPHORE

+

+/* Using Mutex*/

+#define RT_USING_MUTEX

+

+/* Using Event*/

+#define RT_USING_EVENT

+

+/* Using Faset Event*/

+/* #define RT_USING_FASTEVENT */

+

+/* Using MailBox*/

+#define RT_USING_MAILBOX

+

+/* Using Message Queue*/

+#define RT_USING_MESSAGEQUEUE

+

+/* SECTION: Memory Management */

+/* Using Memory Pool Management*/

+#define RT_USING_MEMPOOL

+

+/* Using Dynamic Heap Management*/

+#define RT_USING_HEAP

+

+/* Using Small MM*/

+#define RT_USING_SMALL_MEM

+

+/* Using SLAB Allocator*/

+/* #define RT_USING_SLAB */

+

+/* SECTION: Device System */

+/* Using Device System*/

+#define RT_USING_DEVICE

+

+#define RT_USING_UART1

+// #define RT_USING_UART2

+// #define RT_USING_UART3

+

 /* SECTION: Console options */

-#define RT_USING_CONSOLE
-/* the buffer size of console*/
-#define RT_CONSOLEBUF_SIZE	128
-
-/* SECTION: FinSH shell options */
-/* Using FinSH as Shell*/
-#define RT_USING_FINSH
-/* Using symbol table */
-#define FINSH_USING_SYMTAB
-#define FINSH_USING_DESCRIPTION
-
-/* SECTION: a mini libc */
-/* Using mini libc library*/
-/* #define RT_USING_MINILIBC */
-
-/* SECTION: C++ support */
-/* Using C++ support*/
-/* #define RT_USING_CPLUSPLUS */
-
-#define RT_USING_DFS
-/* SECTION: DFS options */
-#define RT_USING_DFS_ELMFAT
-#define RT_DFS_ELM_WORD_ACCESS
-
-/* the max number of mounted filesystem */
-#define DFS_FILESYSTEMS_MAX		1
-/* the max number of opened files 		*/
-#define DFS_FD_MAX					4
-/* the max number of cached sector 		*/
-#define DFS_CACHE_MAX_NUM   		4
-
-/* SECTION: lwip, a lighwight TCP/IP protocol stack */
-/* Using lighweight TCP/IP protocol stack*/
-#define RT_USING_LWIP
-
-/* Trace LwIP protocol*/
-/* #define RT_LWIP_DEBUG */
-
-#define RT_LWIP_USING_RT_MEM
-
-/* Enable ICMP protocol*/
-#define RT_LWIP_ICMP
-
-/* Enable IGMP protocol*/
-#define RT_LWIP_IGMP
-
-/* Enable UDP protocol*/
-#define RT_LWIP_UDP
-
-/* Enable TCP protocol*/
-#define RT_LWIP_TCP
-
-/* the number of simulatenously active TCP connections*/
-#define RT_LWIP_TCP_PCB_NUM	5
-
-/* Ethernet padding size */
-#define RT_LWIP_ETH_PAD_SIZE 2
-
-/* TCP sender buffer space*/
-#define RT_LWIP_TCP_SND_BUF	1024*8
-/* Enable SNMP protocol*/
-#define RT_LWIP_SNMP
-
-/* Using DHCP*/
-/* #define RT_LWIP_DHCP */
-
-#define RT_LWIP_DNS
-
-/* ip address of target*/
-#define RT_LWIP_IPADDR0	192
-#define RT_LWIP_IPADDR1	168
-#define RT_LWIP_IPADDR2	1
-#define RT_LWIP_IPADDR3	30
-
-/* gateway address of target*/
-#define RT_LWIP_GWADDR0	192
-#define RT_LWIP_GWADDR1	168
-#define RT_LWIP_GWADDR2	1
-#define RT_LWIP_GWADDR3	1
-
-/* mask address of target*/
-#define RT_LWIP_MSKADDR0	255
-#define RT_LWIP_MSKADDR1	255
-#define RT_LWIP_MSKADDR2	255
-#define RT_LWIP_MSKADDR3	0
-
-/* tcp thread options */
-#define RT_LWIP_TCPTHREAD_PRIORITY		22
-#define RT_LWIP_TCPTHREAD_MBOX_SIZE		4
-#define RT_LWIP_TCPTHREAD_STACKSIZE		1024
-
-/* ethernet if thread options */
-#define RT_LWIP_ETHTHREAD_PRIORITY		23
-#define RT_LWIP_ETHTHREAD_MBOX_SIZE		4
-#define RT_LWIP_ETHTHREAD_STACKSIZE		512
-#endif
+#define RT_USING_CONSOLE

+/* the buffer size of console*/

+#define RT_CONSOLEBUF_SIZE	128

+

+/* SECTION: FinSH shell options */

+/* Using FinSH as Shell*/

+#define RT_USING_FINSH

+/* Using symbol table */

+#define FINSH_USING_SYMTAB

+#define FINSH_USING_DESCRIPTION

+

+#define RT_USING_DFS

+/* SECTION: DFS options */

+#define RT_USING_DFS_ELMFAT

+#define RT_DFS_ELM_WORD_ACCESS

+

+/* the max number of mounted filesystem */

+#define DFS_FILESYSTEMS_MAX		1

+/* the max number of opened files 		*/

+#define DFS_FD_MAX					4

+/* the max number of cached sector 		*/

+#define DFS_CACHE_MAX_NUM   		4

+

+/* SECTION: lwip, a lighwight TCP/IP protocol stack */

+/* Using lighweight TCP/IP protocol stack*/

+#define RT_USING_LWIP

+

+/* Trace LwIP protocol*/

+/* #define RT_LWIP_DEBUG */

+

+#define RT_LWIP_USING_RT_MEM

+

+/* Enable ICMP protocol*/

+#define RT_LWIP_ICMP

+

+/* Enable IGMP protocol*/

+#define RT_LWIP_IGMP

+

+/* Enable UDP protocol*/

+#define RT_LWIP_UDP

+

+/* Enable TCP protocol*/

+#define RT_LWIP_TCP

+

+/* the number of simulatenously active TCP connections*/

+#define RT_LWIP_TCP_PCB_NUM	5

+

+/* Ethernet padding size */

+#define RT_LWIP_ETH_PAD_SIZE 2

+

+/* TCP sender buffer space*/

+#define RT_LWIP_TCP_SND_BUF	1024*8

+/* Enable SNMP protocol*/

+#define RT_LWIP_SNMP

+

+/* Using DHCP*/

+/* #define RT_LWIP_DHCP */

+

+#define RT_LWIP_DNS

+

+/* ip address of target*/

+#define RT_LWIP_IPADDR0	192

+#define RT_LWIP_IPADDR1	168

+#define RT_LWIP_IPADDR2	1

+#define RT_LWIP_IPADDR3	30

+

+/* gateway address of target*/

+#define RT_LWIP_GWADDR0	192

+#define RT_LWIP_GWADDR1	168

+#define RT_LWIP_GWADDR2	1

+#define RT_LWIP_GWADDR3	1

+

+/* mask address of target*/

+#define RT_LWIP_MSKADDR0	255

+#define RT_LWIP_MSKADDR1	255

+#define RT_LWIP_MSKADDR2	255

+#define RT_LWIP_MSKADDR3	0

+

+/* tcp thread options */

+#define RT_LWIP_TCPTHREAD_PRIORITY		22

+#define RT_LWIP_TCPTHREAD_MBOX_SIZE		4

+#define RT_LWIP_TCPTHREAD_STACKSIZE		1024

+

+/* ethernet if thread options */

+#define RT_LWIP_ETHTHREAD_PRIORITY		23

+#define RT_LWIP_ETHTHREAD_MBOX_SIZE		4

+#define RT_LWIP_ETHTHREAD_STACKSIZE		512

+#endif

diff --git a/bsp/lm3s/template.Uv2 b/bsp/lm3s/template.Uv2
index 93f43b513e..a46bbe6f4c 100644
--- a/bsp/lm3s/template.Uv2
+++ b/bsp/lm3s/template.Uv2
@@ -7,14 +7,14 @@ Target (RT-Thread-lm3s), 0x0004 // Tools: 'ARM-ADS'
 

 

 Options 1,0,0  // Target 'RT-Thread-lm3s'

- Device (LM3S6918)

+ Device (LM3S8962)

  Vendor (Luminary Micro)

  Cpu (IRAM(0x20000000-0x2000FFFF) IROM(0-0x3FFFF) CLOCK(8000000) CPUTYPE("Cortex-M3"))

  FlashUt ()

  StupF ("STARTUP\Luminary\Startup.s" ("Luminary Startup Code"))

  FlashDR (UL2CM3(-UU0101L5E -O14 -S0 -C0 -N00("ARM Cortex-M3") -D00(1BA00477) -L00(4) -FO7 -FD20000000 -FC800 -FN1 -FF0LM3S_256 -FS00 -FL040000))

- DevID (4722)

- Rgf (LM3Sxxxx.H)

+ DevID (4285)

+ Rgf (LM3Sxxx.H)

  Mem ()

  C ()

  A ()

@@ -28,17 +28,17 @@ Options 1,0,0  // Target 'RT-Thread-lm3s'
  EnvBin ()

  EnvInc ()

  EnvLib ()

- EnvReg (�Luminary\)

- OrgReg (�Luminary\)

+ EnvReg (Luminary\)

+ OrgReg (Luminary\)

  TgStat=16

- OutDir (.\)

+ OutDir (.\objs\)

  OutName (rtthread-lm3s)

  GenApp=1

  GenLib=0

  GenHex=0

  Debug=1

  Browse=1

- LstDir (.\)

+ LstDir (.\objs\)

  HexSel=1

  MG32K=0

  TGMORE=0

@@ -88,11 +88,11 @@ Options 1,0,0  // Target 'RT-Thread-lm3s'
  ADSLDMC ()

  ADSLDIF ()

  ADSLDDW ()

-  OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S6918)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S6918)

+  OPTDL (SARMCM3.DLL)()(DLM.DLL)(-pLM3S8962)(SARMCM3.DLL)()(TLM.DLL)(-pLM3S8962)

   OPTDBG 48118,4,()()()()()()()()()() (BIN\lmidk-agdi.dll)()()()

  FLASH1 { 1,0,0,0,1,0,0,0,3,16,0,0,0,0,0,0,0,0,0,0 }

  FLASH2 (BIN\lmidk-agdi.dll)

- FLASH3 ("" ())

+ FLASH3 ()

  FLASH4 ()

 EndOpt