update the sam7x project

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

18 files changed, 57 insertions, 43 deletions

diff --git a/bsp/sam7x/SConscript b/bsp/sam7x/SConscript
index 2804c7dedf..0992612410 100644
--- a/bsp/sam7x/SConscript
+++ b/bsp/sam7x/SConscript
@@ -1,19 +1,12 @@
-import rtconfig
-Import('RTT_ROOT')
 from building import *
 
-src_bsp = ['application.c', 'startup.c', 'board.c']
-src_drv = ['serial.c']
+cwd  = GetCurrentDir()
+objs = []
+list = os.listdir(cwd)
 
-if GetDepend('RT_USING_DFS'):
-	src_drv += ['sd.c']
+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'))
 
-if GetDepend('RT_USING_LWIP'):
-	src_drv += ['sam7x_emac.c']
-
-
-src	= File(src_bsp + src_drv)
-CPPPATH = [RTT_ROOT + '/bsp/sam7x']
-group = DefineGroup('Startup', src, depend = [''], CPPPATH = CPPPATH)
-
-Return('group')
+Return('objs')
diff --git a/bsp/sam7x/applications/SConscript b/bsp/sam7x/applications/SConscript
new file mode 100644
index 0000000000..4fe38ed0cf
--- /dev/null
+++ b/bsp/sam7x/applications/SConscript
@@ -0,0 +1,9 @@
+from building import *

+

+cwd     = GetCurrentDir()

+src	= Glob('*.c')

+CPPPATH = [cwd, str(Dir('#'))]

+

+group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)

+

+Return('group')

diff --git a/bsp/sam7x/application.c b/bsp/sam7x/applications/application.c
index 1cb09b0bf9..5cd12348de 100644
--- a/bsp/sam7x/application.c
+++ b/bsp/sam7x/applications/application.c
@@ -30,7 +30,9 @@
 #endif
 
 #ifdef RT_USING_LWIP
-#include <lwip/sys.h>
+#include <lwip/sys.h>

+#include <netif/ethernetif.h>

+#include "sam7x_emac.h"
 #endif
 
 #ifdef RT_USING_RTGUI
diff --git a/bsp/sam7x/startup.c b/bsp/sam7x/applications/startup.c
index abf9b58c51..abf9b58c51 100644
--- a/bsp/sam7x/startup.c
+++ b/bsp/sam7x/applications/startup.c
diff --git a/bsp/sam7x/AT91SAM7X.h b/bsp/sam7x/drivers/AT91SAM7X.h
index 54a7d11c46..54a7d11c46 100644
--- a/bsp/sam7x/AT91SAM7X.h
+++ b/bsp/sam7x/drivers/AT91SAM7X.h
diff --git a/bsp/sam7x/AT91SAM7X256.h b/bsp/sam7x/drivers/AT91SAM7X256.h
index c3ae56b10e..c3ae56b10e 100644
--- a/bsp/sam7x/AT91SAM7X256.h
+++ b/bsp/sam7x/drivers/AT91SAM7X256.h
diff --git a/bsp/sam7x/drivers/SConscript b/bsp/sam7x/drivers/SConscript
new file mode 100644
index 0000000000..5b10d6f2f5
--- /dev/null
+++ b/bsp/sam7x/drivers/SConscript
@@ -0,0 +1,16 @@
+from building import *

+

+cwd = GetCurrentDir()

+src = Glob('*.c')

+

+# remove no need file.

+if GetDepend('RT_USING_LWIP') == False:

+    SrcRemove(src, 'sam7x_emac.c')

+if GetDepend('RT_USING_DFS') == False:

+    SrcRemove(src, 'ssd.c')

+

+CPPPATH = [cwd]

+

+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)

+

+Return('group')

diff --git a/bsp/sam7x/board.c b/bsp/sam7x/drivers/board.c
index b25c4e5cf1..b25c4e5cf1 100644
--- a/bsp/sam7x/board.c
+++ b/bsp/sam7x/drivers/board.c
diff --git a/bsp/sam7x/board.h b/bsp/sam7x/drivers/board.h
index 97a1e449fc..97a1e449fc 100644
--- a/bsp/sam7x/board.h
+++ b/bsp/sam7x/drivers/board.h
diff --git a/bsp/sam7x/mii.h b/bsp/sam7x/drivers/mii.h
index 4ec25667a3..4ec25667a3 100644
--- a/bsp/sam7x/mii.h
+++ b/bsp/sam7x/drivers/mii.h
diff --git a/bsp/sam7x/sam7x_emac.c b/bsp/sam7x/drivers/sam7x_emac.c
index e84807f3ab..e84807f3ab 100644
--- a/bsp/sam7x/sam7x_emac.c
+++ b/bsp/sam7x/drivers/sam7x_emac.c
diff --git a/bsp/sam7x/sam7x_emac.h b/bsp/sam7x/drivers/sam7x_emac.h
index 4a351fe9b3..ff9102ae4e 100644
--- a/bsp/sam7x/sam7x_emac.h
+++ b/bsp/sam7x/drivers/sam7x_emac.h
@@ -4,9 +4,6 @@
 //#define DM9161

 #define RTL8201 

 

-

-

-

 #ifdef 	 DM9161

    #define AT91C_PHY_ADDR	31

 #else

@@ -94,7 +91,6 @@
 #define DM9161_DUPLEX_MODE       (1 << 8)  // 1 = Full duplex operation 0 = Normal operation

 #define DM9161_COLLISION_TEST    (1 << 7)  // 1 = Collision test enabled 0 = Normal operation

 

-

 #define DM9161_NP               (1 << 15) // Next page Indication

 #define DM9161_ACK              (1 << 14) // Acknowledge

 #define DM9161_RF               (1 << 13) // Remote Fault

diff --git a/bsp/sam7x/sd.c b/bsp/sam7x/drivers/sd.c
index ef955d44bc..ef955d44bc 100644
--- a/bsp/sam7x/sd.c
+++ b/bsp/sam7x/drivers/sd.c
diff --git a/bsp/sam7x/sd.h b/bsp/sam7x/drivers/sd.h
index 0f38e06dfb..0f38e06dfb 100644
--- a/bsp/sam7x/sd.h
+++ b/bsp/sam7x/drivers/sd.h
diff --git a/bsp/sam7x/serial.c b/bsp/sam7x/drivers/serial.c
index 19aa87666b..19aa87666b 100644
--- a/bsp/sam7x/serial.c
+++ b/bsp/sam7x/drivers/serial.c
diff --git a/bsp/sam7x/serial.h b/bsp/sam7x/drivers/serial.h
index 5fe0928c9a..5fe0928c9a 100644
--- a/bsp/sam7x/serial.h
+++ b/bsp/sam7x/drivers/serial.h
diff --git a/bsp/sam7x/project.uvproj b/bsp/sam7x/project.uvproj
index 44e303f7c2..c30f48ab07 100644
--- a/bsp/sam7x/project.uvproj
+++ b/bsp/sam7x/project.uvproj
@@ -61,6 +61,8 @@
             <UserProg2Name></UserProg2Name>
             <UserProg1Dos16Mode>0</UserProg1Dos16Mode>
             <UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+            <nStopU1X>0</nStopU1X>
+            <nStopU2X>0</nStopU2X>
           </BeforeCompile>
           <BeforeMake>
             <RunUserProg1>0</RunUserProg1>
@@ -346,7 +348,7 @@
               <MiscControls></MiscControls>
               <Define></Define>
               <Undefine></Undefine>
-              <IncludePath>.;..\..\components\finsh;..\..\components\net\lwip\src;..\..\components\net\lwip\src\arch\include;..\..\components\net\lwip\src\include;..\..\components\net\lwip\src\include\ipv4;..\..\components\net\lwip\src\include\netif;..\..\include;..\..\libcpu\arm\AT91SAM7X;..\..\libcpu\arm\common</IncludePath>
+              <IncludePath>.;..\..\components\finsh;..\..\components\net\lwip\src;..\..\components\net\lwip\src\arch\include;..\..\components\net\lwip\src\include;..\..\components\net\lwip\src\include\ipv4;..\..\components\net\lwip\src\include\netif;..\..\include;..\..\libcpu\arm\AT91SAM7X;..\..\libcpu\arm\common;applications;drivers</IncludePath>
             </VariousControls>
           </Cads>
           <Aads>
@@ -384,32 +386,37 @@
       </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>Drivers</GroupName>
+          <Files>
             <File>
               <FileName>board.c</FileName>
               <FileType>1</FileType>
-              <FilePath>.\board.c</FilePath>
+              <FilePath>drivers\board.c</FilePath>
             </File>
             <File>
-              <FileName>serial.c</FileName>
+              <FileName>sam7x_emac.c</FileName>
               <FileType>1</FileType>
-              <FilePath>.\serial.c</FilePath>
+              <FilePath>drivers\sam7x_emac.c</FilePath>
             </File>
             <File>
-              <FileName>sam7x_emac.c</FileName>
+              <FileName>serial.c</FileName>
               <FileType>1</FileType>
-              <FilePath>.\sam7x_emac.c</FilePath>
+              <FilePath>drivers\serial.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -452,11 +459,6 @@
               <FilePath>..\..\src\mem.c</FilePath>
             </File>
             <File>
-              <FileName>memheap.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\src\memheap.c</FilePath>
-            </File>
-            <File>
               <FileName>mempool.c</FileName>
               <FileType>1</FileType>
               <FilePath>..\..\src\mempool.c</FilePath>
diff --git a/bsp/sam7x/rtconfig.py b/bsp/sam7x/rtconfig.py
index 18b19fc1b3..57a131a43d 100644
--- a/bsp/sam7x/rtconfig.py
+++ b/bsp/sam7x/rtconfig.py
@@ -1,21 +1,17 @@
 import os
 
-# panel options
-# 'PNL_A70','PNL_N35', 'PNL_T35'
-RT_USING_LCD_TYPE = 'PNL_T35'
-
 # toolchains options
-ARCH     = 'arm'
-CPU      = 'AT91SAM7X'
+ARCH = 'arm'
+CPU  = 'AT91SAM7X'
 
-CROSS_TOOL 	= 'gcc'
+CROSS_TOOL = 'gcc'
 
 if os.getenv('RTT_CC'):
 	CROSS_TOOL = os.getenv('RTT_CC')
 
-if  CROSS_TOOL == 'gcc':
+if CROSS_TOOL == 'gcc':
 	PLATFORM 	= 'gcc'
-	EXEC_PATH 	= 'C:/Program Files/CodeSourcery/Sourcery G++ Lite/bin'
+	EXEC_PATH 	= 'C:/Program Files/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin'
 elif CROSS_TOOL == 'keil':
 	PLATFORM 	= 'armcc'
 	EXEC_PATH 	= 'C:/Keil'