Merge pull request #540 from pangweishen/master

[BSP]fixed some bugs for compile.

bsp/mini2440/SConscript

-import rtconfig
+# for module compiling
+import os
 Import('RTT_ROOT')
-from building import *
 
-src_bsp = ['application.c', 'startup.c', 'board.c']
-src_drv = ['console.c', 'led.c']
+cwd = str(Dir('#'))
+objs = []
+list = os.listdir(cwd)
 
-if GetDepend('RT_USING_DFS'):
-	src_drv += ['sdcard.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 += ['dm9000.c']
-
-if GetDepend('RT_USING_RTGUI'):
-    src_drv += ['touch.c', 'key.c', 'calibration.c']
-
-if GetDepend('RT_USING_FTK'):
-    src_drv += ['touch.c', 'key.c']
-
-if GetDepend('RT_USING_RTI'):
-    src_drv += ['rti_stub.c']
-		
-if GetDepend('RT_USING_RTGUI') or GetDepend('RT_USING_FTK'):
-	if rtconfig.RT_USING_LCD_TYPE == 'PNL_A70':
-		src_drv += ['lcd_a70.c']
-	elif rtconfig.RT_USING_LCD_TYPE == 'PNL_N35':
-		src_drv += ['lcd_n35.c']
-	elif rtconfig.RT_USING_LCD_TYPE == 'PNL_T35':
-		src_drv += ['lcd_t35.c']
-	elif rtconfig.RT_USING_LCD_TYPE == 'PNL_X35':
-                src_drv += ['lcd_x35.c']
-
-src	= File(src_bsp + src_drv)
-CPPPATH = [GetCurrentDir()]
-group = DefineGroup('Startup', src, depend = [''], CPPPATH = CPPPATH)
-
-Return('group')
+Return('objs')

bsp/mini2440/applications/SConscript

+Import('RTT_ROOT')
+Import('rtconfig')
+from building import *
+
+cwd     = os.path.join(str(Dir('#')), 'applications')
+src	= Glob('*.c')
+CPPPATH = [cwd, str(Dir('#'))]
+
+group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
+
+Return('group')

bsp/mini2440/drivers/SConscript

+Import('RTT_ROOT')
+Import('rtconfig')
+from building import *
+
+cwd     = os.path.join(str(Dir('#')), 'drivers')
+
+# add the general drivers.
+src = Split("""
+board.c
+led.c
+console.c
+""")
+
+if GetDepend('RT_USING_DFS'):
+	src += ['sdcard.c']
+
+if GetDepend('RT_USING_LWIP'):
+	src += ['dm9000.c']
+
+if GetDepend('RT_USING_RTGUI'):
+    	src += ['touch.c', 'key.c', 'calibration.c']
+
+if GetDepend('RT_USING_FTK'):
+    	src += ['touch.c', 'key.c']
+
+if GetDepend('RT_USING_RTI'):
+    	src += ['rti_stub.c']
+		
+if GetDepend('RT_USING_RTGUI') or GetDepend('RT_USING_FTK'):
+	if rtconfig.RT_USING_LCD_TYPE == 'PNL_A70':
+		src += ['lcd_a70.c']
+	elif rtconfig.RT_USING_LCD_TYPE == 'PNL_N35':
+		src += ['lcd_n35.c']
+	elif rtconfig.RT_USING_LCD_TYPE == 'PNL_T35':
+		src += ['lcd_t35.c']
+	elif rtconfig.RT_USING_LCD_TYPE == 'PNL_X35':
+                src += ['lcd_x35.c']
+
+CPPPATH = [cwd]
+
+group = DefineGroup('Drivers', src, depend = [''], CPPPATH = CPPPATH)
+
+Return('group')
+

bsp/mini2440/key.c → bsp/mini2440/drivers/key.c

@@ -129,7 +129,7 @@ static void key_init(void)
 	/* install key isr */
 	INTSUBMSK &= ~(BIT_SUB_RXD1);
 
-	rt_hw_interrupt_install(INTUART1, rt_key_handler, RT_NULL);
+	rt_hw_interrupt_install(INTUART1, rt_key_handler, RT_NULL , "INTUART1");
 	rt_hw_interrupt_umask(INTUART1);
 }
 

bsp/mini2440/touch.c → bsp/mini2440/drivers/touch.c

@@ -384,7 +384,7 @@ static rt_err_t rtgui_touch_init(rt_device_t dev)
 
 	ADCTSC = WAIT4INT(0);
 
-	rt_hw_interrupt_install(INTADC, rt_touch_handler, RT_NULL);
+	rt_hw_interrupt_install(INTADC, rt_touch_handler, RT_NULL , "INTADC");
 	rt_hw_interrupt_umask(INTADC);
 
 	/* clear interrupt */

bsp/mini2440/rtconfig.h

@@ -212,7 +212,7 @@
 // <bool name="RTGUI_IMAGE_JPEG" description="Using jpeg image in RTGUI" default="true" />
 #define RTGUI_IMAGE_JPEG
 // <bool name="RTGUI_IMAGE_PNG" description="Using png image in RTGUI" default="true" />
-#define RTGUI_IMAGE_PNG
+//#define RTGUI_IMAGE_PNG
 // <bool name="RTGUI_IMAGE_BMP" description="Using bmp image in RTGUI" default="true" />
 #define RTGUI_IMAGE_BMP
 // </section>

bsp/mini2440/rtconfig.py

@@ -9,7 +9,7 @@ ARCH     = 'arm'
 CPU      = 's3c24x0'
 TextBase = '0x30000000'
 
-CROSS_TOOL 	= 'gcc'
+CROSS_TOOL 	= 'keil'
 
 if os.getenv('RTT_CC'):
     CROSS_TOOL = os.getenv('RTT_CC')