From 5de50e1422831018e61149161424fc3b5befd3a2 Mon Sep 17 00:00:00 2001
From: wuyangyong <wuyangyong@gmail.com>
Date: Thu, 13 Oct 2011 18:04:20 +0000
Subject: [PATCH] update lpc178x bsp

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1763 bbd45198-f89e-11dd-88c7-29a3b14d5316
---
 bsp/lpc178x/CMSIS/SConscript |   8 +++
 bsp/lpc178x/SConscript       |  11 +---
 bsp/lpc178x/project.uvproj   | 108 ++++++-----------------------------
 3 files changed, 27 insertions(+), 100 deletions(-)

diff --git a/bsp/lpc178x/CMSIS/SConscript b/bsp/lpc178x/CMSIS/SConscript
index 5dc154e88e..0eacdbe82c 100644
--- a/bsp/lpc178x/CMSIS/SConscript
+++ b/bsp/lpc178x/CMSIS/SConscript
@@ -7,6 +7,14 @@ src	= Glob('*.c')
 src = ['CM3/CoreSupport/core_cm3.c', 'CM3/DeviceSupport/NXP/LPC177x_8x/system_LPC177x_8x.c']
 CPPPATH = [cwd + '/CM3/CoreSupport', cwd + '/CM3/DeviceSupport/NXP/LPC177x_8x/']
 
+# add for startup script 
+if rtconfig.CROSS_TOOL == 'gcc':
+	src += ['CM3/DeviceSupport/NXP/LPC177x_8x/startup/gcc/startup_LPC177x_8x.s']
+elif rtconfig.CROSS_TOOL == 'keil':
+	src += ['CM3/DeviceSupport/NXP/LPC177x_8x/startup/arm/startup_LPC177x_8x.s']
+elif rtconfig.CROSS_TOOL == 'iar':
+	src += ['CM3/DeviceSupport/NXP/LPC177x_8x/startup/iar/startup_LPC177x_8x.s']
+
 group = DefineGroup('CMSIS', src, depend = [''], CPPPATH = CPPPATH)
 
 Return('group')
diff --git a/bsp/lpc178x/SConscript b/bsp/lpc178x/SConscript
index 255e234b2a..1bb1701d1f 100644
--- a/bsp/lpc178x/SConscript
+++ b/bsp/lpc178x/SConscript
@@ -2,16 +2,9 @@ import rtconfig
 Import('RTT_ROOT')
 from building import *
 
-src_bsp   = ['application.c', 'startup.c', 'board.c']
-src_drv   = ['uart.c', 'led.c']
+src_bsp   = ['application.c', 'startup.c']
 
-if GetDepend('RT_USING_DFS'):
-    src_drv += ['sd.c', 'spi.c']
-
-if GetDepend('RT_USING_LWIP'):
-    src_drv += ['emac.c']
-
-src = File(src_bsp + src_drv)
+src = File(src_bsp)
 CPPPATH = [ GetCurrentDir() ]
 CPPDEFINES = []
 group = DefineGroup('Startup', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
diff --git a/bsp/lpc178x/project.uvproj b/bsp/lpc178x/project.uvproj
index 73068db4af..4c986e40d8 100644
--- a/bsp/lpc178x/project.uvproj
+++ b/bsp/lpc178x/project.uvproj
@@ -158,7 +158,7 @@
             <UseTargetDll>1</UseTargetDll>
             <UseExternalTool>0</UseExternalTool>
             <RunIndependent>0</RunIndependent>
-            <UpdateFlashBeforeDebugging>0</UpdateFlashBeforeDebugging>
+            <UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
             <Capability>1</Capability>
             <DriverSelection>4099</DriverSelection>
           </Flash1>
@@ -346,7 +346,7 @@
               <MiscControls></MiscControls>
               <Define></Define>
               <Undefine></Undefine>
-              <IncludePath>CMSIS\CM3\DeviceSupport\NXP\LPC177x_8x;.;..\..\libcpu\arm\lpc17xx;..\..\include;..\..\libcpu\arm\common;CMSIS\CM3\CoreSupport;..\..\components\finsh</IncludePath>
+              <IncludePath>CMSIS\CM3\DeviceSupport\NXP\LPC177x_8x;drivers;.;..\..\libcpu\arm\lpc17xx;..\..\include;..\..\libcpu\arm\common;CMSIS\CM3\CoreSupport;..\..\components\finsh</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -385,60 +385,6 @@
       <Groups>
         <Group>
           <GroupName>Startup</GroupName>
-          <GroupOption>
-            <CommonProperty>
-              <UseCPPCompiler>0</UseCPPCompiler>
-              <RVCTCodeConst>0</RVCTCodeConst>
-              <RVCTZI>0</RVCTZI>
-              <RVCTOtherData>0</RVCTOtherData>
-              <ModuleSelection>0</ModuleSelection>
-              <IncludeInBuild>2</IncludeInBuild>
-              <AlwaysBuild>2</AlwaysBuild>
-              <GenerateAssemblyFile>2</GenerateAssemblyFile>
-              <AssembleAssemblyFile>2</AssembleAssemblyFile>
-              <PublicsOnly>2</PublicsOnly>
-              <StopOnExitCode>11</StopOnExitCode>
-              <CustomArgument></CustomArgument>
-              <IncludeLibraryModules></IncludeLibraryModules>
-            </CommonProperty>
-            <GroupArmAds>
-              <Cads>
-                <interw>2</interw>
-                <Optim>0</Optim>
-                <oTime>2</oTime>
-                <SplitLS>2</SplitLS>
-                <OneElfS>2</OneElfS>
-                <Strict>2</Strict>
-                <EnumInt>2</EnumInt>
-                <PlainCh>2</PlainCh>
-                <Ropi>2</Ropi>
-                <Rwpi>2</Rwpi>
-                <wLevel>0</wLevel>
-                <uThumb>2</uThumb>
-                <VariousControls>
-                  <MiscControls></MiscControls>
-                  <Define></Define>
-                  <Undefine></Undefine>
-                  <IncludePath>.\drivers</IncludePath>
-                </VariousControls>
-              </Cads>
-              <Aads>
-                <interw>2</interw>
-                <Ropi>2</Ropi>
-                <Rwpi>2</Rwpi>
-                <thumb>2</thumb>
-                <SplitLS>2</SplitLS>
-                <SwStkChk>2</SwStkChk>
-                <NoWarn>2</NoWarn>
-                <VariousControls>
-                  <MiscControls></MiscControls>
-                  <Define></Define>
-                  <Undefine></Undefine>
-                  <IncludePath></IncludePath>
-                </VariousControls>
-              </Aads>
-            </GroupArmAds>
-          </GroupOption>
           <Files>
             <File>
               <FileName>application.c</FileName>
@@ -521,35 +467,15 @@
           <GroupName>LPC17XX</GroupName>
           <Files>
             <File>
-              <FileName>cpu.c</FileName>
+              <FileName>cpuport.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\libcpu\arm\lpc17xx\cpu.c</FilePath>
-            </File>
-            <File>
-              <FileName>fault.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\libcpu\arm\lpc17xx\fault.c</FilePath>
-            </File>
-            <File>
-              <FileName>interrupt.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\libcpu\arm\lpc17xx\interrupt.c</FilePath>
-            </File>
-            <File>
-              <FileName>stack.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\libcpu\arm\lpc17xx\stack.c</FilePath>
+              <FilePath>..\..\libcpu\arm\lpc17xx\cpuport.c</FilePath>
             </File>
             <File>
               <FileName>context_rvds.S</FileName>
               <FileType>2</FileType>
               <FilePath>..\..\libcpu\arm\lpc17xx\context_rvds.S</FilePath>
             </File>
-            <File>
-              <FileName>fault_rvds.S</FileName>
-              <FileType>2</FileType>
-              <FilePath>..\..\libcpu\arm\lpc17xx\fault_rvds.S</FilePath>
-            </File>
             <File>
               <FileName>backtrace.c</FileName>
               <FileType>1</FileType>
@@ -653,37 +579,37 @@
             <File>
               <FileName>startup_LPC177x_8x.s</FileName>
               <FileType>2</FileType>
-              <FilePath>.\CMSIS\CM3\DeviceSupport\NXP\LPC177x_8x\startup\arm\startup_LPC177x_8x.s</FilePath>
+              <FilePath>CMSIS\CM3\DeviceSupport\NXP\LPC177x_8x\startup\arm\startup_LPC177x_8x.s</FilePath>
             </File>
           </Files>
         </Group>
         <Group>
-          <GroupName>driver</GroupName>
+          <GroupName>Drivers</GroupName>
           <Files>
             <File>
-              <FileName>lpc177x_8x_uart.c</FileName>
+              <FileName>board.c</FileName>
               <FileType>1</FileType>
-              <FilePath>.\drivers\lpc177x_8x_uart.c</FilePath>
+              <FilePath>drivers\board.c</FilePath>
             </File>
             <File>
               <FileName>lpc177x_8x_clkpwr.c</FileName>
               <FileType>1</FileType>
-              <FilePath>.\drivers\lpc177x_8x_clkpwr.c</FilePath>
-            </File>
-            <File>
-              <FileName>uart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>.\drivers\uart.c</FilePath>
+              <FilePath>drivers\lpc177x_8x_clkpwr.c</FilePath>
             </File>
             <File>
               <FileName>lpc177x_8x_pinsel.c</FileName>
               <FileType>1</FileType>
-              <FilePath>.\drivers\lpc177x_8x_pinsel.c</FilePath>
+              <FilePath>drivers\lpc177x_8x_pinsel.c</FilePath>
             </File>
             <File>
-              <FileName>board.c</FileName>
+              <FileName>lpc177x_8x_uart.c</FileName>
               <FileType>1</FileType>
-              <FilePath>.\drivers\board.c</FilePath>
+              <FilePath>drivers\lpc177x_8x_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>drivers\uart.c</FilePath>
             </File>
           </Files>
         </Group>