瀏覽代碼

revert RTGUI path in SConstruct, update applications/platform.c

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2462 bbd45198-f89e-11dd-88c7-29a3b14d5316
goprife@gmail.com 12 年之前
父節點
當前提交
7c82d6e304
共有 2 個文件被更改,包括 5 次插入9 次删除
  1. 2 2
      bsp/simulator/SConstruct
  2. 3 7
      bsp/simulator/applications/platform.c

+ 2 - 2
bsp/simulator/SConstruct

@@ -12,8 +12,8 @@ if os.getenv('RTT_RTGUI'):
 else:
     # set the rtgui root directory by hand
     # empty string means use the RTGUI in svn
-    RTT_RTGUI = os.path.normpath(r'F:\Project\git\rt-gui\components\rtgui')
-    # RTT_RTGUI =''
+    # RTT_RTGUI = os.path.normpath(r'F:\Project\git\rt-gui\components\rtgui')
+    RTT_RTGUI =''
 
 sys.path = sys.path + [os.path.join(RTT_ROOT, 'tools')]
 from building import *

+ 3 - 7
bsp/simulator/applications/platform.c

@@ -5,25 +5,21 @@ void rt_platform_init(void)
 {
 #ifdef RT_USING_DFS
     /* initilize sd card */
-#ifdef RT_USING_DFS_ELMFAT
     rt_hw_sdcard_init();
-#endif 
 
-#if defined(RT_USING_MTD_NAND) && defined(RT_USING_DFS_UFFS)
+#if defined(RT_USING_MTD_NAND)
     rt_hw_mtd_nand_init();
 #endif 
 
-#if defined(RT_USING_MTD_NOR) && defined(RT_USING_DFS_JFFS2)
+#if defined(RT_USING_MTD_NOR)
     sst25vfxx_mtd_init("nor", 0, RT_UINT32_MAX);
 #endif 
 
 #endif /* RT_USING_DFS */
 
 #ifdef RT_USING_RTGUI
-
     /* initilize sdl */
-	 sdl_start();
-
+    sdl_start();
 #endif /* RT_USING_RTGUI */
 
     rt_thread_delay(50);