From 04ab961b6f6ac0b995c21cac7b49624dea0a7555 Mon Sep 17 00:00:00 2001
From: wuyangyong <wuyangyong@gmail.com>
Date: Sat, 5 Nov 2011 10:35:28 +0000
Subject: [PATCH] update lpc1788 bsp

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1786 bbd45198-f89e-11dd-88c7-29a3b14d5316
---
 bsp/lpc178x/SConscript                       |  14 +-
 bsp/lpc178x/SConstruct                       |  13 --
 bsp/lpc178x/{ => applications}/application.c |   0
 bsp/lpc178x/{ => applications}/startup.c     |   0
 bsp/lpc178x/project.uvproj                   | 128 +++++++++----------
 5 files changed, 72 insertions(+), 83 deletions(-)
 rename bsp/lpc178x/{ => applications}/application.c (100%)
 rename bsp/lpc178x/{ => applications}/startup.c (100%)

diff --git a/bsp/lpc178x/SConscript b/bsp/lpc178x/SConscript
index 1bb1701d1f..569e67de75 100644
--- a/bsp/lpc178x/SConscript
+++ b/bsp/lpc178x/SConscript
@@ -2,11 +2,13 @@ import rtconfig
 Import('RTT_ROOT')
 from building import *
 
-src_bsp   = ['application.c', 'startup.c']
+cwd = str(Dir('#'))
+objs = []
+list = os.listdir(cwd)
 
-src = File(src_bsp)
-CPPPATH = [ GetCurrentDir() ]
-CPPDEFINES = []
-group = DefineGroup('Startup', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
+for d in list:
+    path = os.path.join(cwd, d)
+    if os.path.isfile(os.path.join(path, 'SConscript')):
+        objs = objs + SConscript(os.path.join(d, 'SConscript'))
 
-Return('group')
+Return('objs')
diff --git a/bsp/lpc178x/SConstruct b/bsp/lpc178x/SConstruct
index 6b8bc35550..ff91371b27 100644
--- a/bsp/lpc178x/SConstruct
+++ b/bsp/lpc178x/SConstruct
@@ -21,22 +21,9 @@ Export('rtconfig')
 # prepare building environment
 objs = PrepareBuilding(env, RTT_ROOT)
 
-if GetDepend('RT_USING_WEBSERVER'):
-    objs = objs + SConscript(RTT_ROOT + '/components/net/webserver/SConscript', variant_dir='build/net/webserver', duplicate=0)
-
 if GetDepend('RT_USING_RTGUI'):
     objs = objs + SConscript(RTT_ROOT + '/examples/gui/SConscript', variant_dir='build/examples/gui', duplicate=0)
 
-cwd = str(Dir('#'))
-list = os.listdir(cwd)
-for d in list:
-    path = os.path.join(cwd, d)
-    if os.path.isfile(os.path.join(path, 'SConscript')):
-        objs = objs + SConscript(os.path.join(d, 'SConscript'))
-
-# libc testsuite 
-# objs = objs + SConscript(RTT_ROOT + '/examples/libc/SConscript', variant_dir='build/examples/libc', duplicate=0)
-
 # build program 
 env.Program(TARGET, objs)
 
diff --git a/bsp/lpc178x/application.c b/bsp/lpc178x/applications/application.c
similarity index 100%
rename from bsp/lpc178x/application.c
rename to bsp/lpc178x/applications/application.c
diff --git a/bsp/lpc178x/startup.c b/bsp/lpc178x/applications/startup.c
similarity index 100%
rename from bsp/lpc178x/startup.c
rename to bsp/lpc178x/applications/startup.c
diff --git a/bsp/lpc178x/project.uvproj b/bsp/lpc178x/project.uvproj
index 9f08eaccb7..5de2c7bfed 100644
--- a/bsp/lpc178x/project.uvproj
+++ b/bsp/lpc178x/project.uvproj
@@ -346,7 +346,7 @@
               <MiscControls></MiscControls>
               <Define></Define>
               <Undefine></Undefine>
-              <IncludePath>drivers;.;CMSIS\CM3\DeviceSupport\NXP\LPC177x_8x;..\..\include;..\..\libcpu\arm\cortex-m3;..\..\libcpu\arm\common;CMSIS\CM3\CoreSupport;..\..\components\finsh</IncludePath>
+              <IncludePath>..\..\include;drivers;.;CMSIS\CM3\DeviceSupport\NXP\LPC177x_8x;applications;..\..\libcpu\arm\cortex-m3;..\..\libcpu\arm\common;CMSIS\CM3\CoreSupport;..\..\components\finsh</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -384,17 +384,77 @@
       </TargetOption>
       <Groups>
         <Group>
-          <GroupName>Startup</GroupName>
+          <GroupName>Applications</GroupName>
           <Files>
             <File>
               <FileName>application.c</FileName>
               <FileType>1</FileType>
-              <FilePath>.\application.c</FilePath>
+              <FilePath>applications\application.c</FilePath>
             </File>
             <File>
               <FileName>startup.c</FileName>
               <FileType>1</FileType>
-              <FilePath>.\startup.c</FilePath>
+              <FilePath>applications\startup.c</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>CMSIS</GroupName>
+          <Files>
+            <File>
+              <FileName>core_cm3.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>CMSIS\CM3\CoreSupport\core_cm3.c</FilePath>
+            </File>
+            <File>
+              <FileName>system_LPC177x_8x.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>CMSIS\CM3\DeviceSupport\NXP\LPC177x_8x\system_LPC177x_8x.c</FilePath>
+            </File>
+            <File>
+              <FileName>startup_LPC177x_8x.s</FileName>
+              <FileType>2</FileType>
+              <FilePath>CMSIS\CM3\DeviceSupport\NXP\LPC177x_8x\startup\arm\startup_LPC177x_8x.s</FilePath>
+            </File>
+          </Files>
+        </Group>
+        <Group>
+          <GroupName>Drivers</GroupName>
+          <Files>
+            <File>
+              <FileName>board.c</FileName>
+              <FileType>1</FileType>
+              <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>lpc177x_8x_emc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>drivers\lpc177x_8x_emc.c</FilePath>
+            </File>
+            <File>
+              <FileName>lpc177x_8x_pinsel.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>drivers\lpc177x_8x_pinsel.c</FilePath>
+            </File>
+            <File>
+              <FileName>lpc177x_8x_uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>drivers\lpc177x_8x_uart.c</FilePath>
+            </File>
+            <File>
+              <FileName>lpc17xx_lcd.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>drivers\lpc17xx_lcd.c</FilePath>
+            </File>
+            <File>
+              <FileName>uart.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>drivers\uart.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -563,66 +623,6 @@
             </File>
           </Files>
         </Group>
-        <Group>
-          <GroupName>CMSIS</GroupName>
-          <Files>
-            <File>
-              <FileName>core_cm3.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>CMSIS\CM3\CoreSupport\core_cm3.c</FilePath>
-            </File>
-            <File>
-              <FileName>system_LPC177x_8x.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>CMSIS\CM3\DeviceSupport\NXP\LPC177x_8x\system_LPC177x_8x.c</FilePath>
-            </File>
-            <File>
-              <FileName>startup_LPC177x_8x.s</FileName>
-              <FileType>2</FileType>
-              <FilePath>CMSIS\CM3\DeviceSupport\NXP\LPC177x_8x\startup\arm\startup_LPC177x_8x.s</FilePath>
-            </File>
-          </Files>
-        </Group>
-        <Group>
-          <GroupName>Drivers</GroupName>
-          <Files>
-            <File>
-              <FileName>board.c</FileName>
-              <FileType>1</FileType>
-              <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>lpc177x_8x_emc.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>drivers\lpc177x_8x_emc.c</FilePath>
-            </File>
-            <File>
-              <FileName>lpc177x_8x_pinsel.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>drivers\lpc177x_8x_pinsel.c</FilePath>
-            </File>
-            <File>
-              <FileName>lpc177x_8x_uart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>drivers\lpc177x_8x_uart.c</FilePath>
-            </File>
-            <File>
-              <FileName>lpc17xx_lcd.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>drivers\lpc17xx_lcd.c</FilePath>
-            </File>
-            <File>
-              <FileName>uart.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>drivers\uart.c</FilePath>
-            </File>
-          </Files>
-        </Group>
       </Groups>
     </Target>
   </Targets>
-- 
GitLab