Explorar el Código

fix compiling error.

git-svn-id: https://rt-thread.googlecode.com/svn/trunk@1252 bbd45198-f89e-11dd-88c7-29a3b14d5316
bernard.xiong hace 14 años
padre
commit
84ac86f3d1
Se han modificado 3 ficheros con 4 adiciones y 2 borrados
  1. 2 0
      bsp/mini2440/application.c
  2. 1 1
      bsp/mini2440/rtconfig.h
  3. 1 1
      components/dfs/SConscript

+ 2 - 0
bsp/mini2440/application.c

@@ -31,9 +31,11 @@
 #include <dfs_elm.h>
 /* dfs Filesystem APIs */
 #include <dfs_fs.h>
+#ifdef RT_USING_DFS_UFFS
 /* dfs filesystem:UFFS filesystem init */
 #include <dfs_uffs.h>
 #endif
+#endif
 
 #ifdef RT_USING_LWIP
 #include <netif/ethernetif.h>

+ 1 - 1
bsp/mini2440/rtconfig.h

@@ -96,7 +96,7 @@
 /* the max number of file length 		*/
 #define RT_DFS_ELM_MAX_LFN		32
 /* #define RT_USING_DFS_YAFFS2 */
-#define RT_USING_UFFS
+/* #define RT_USING_DFS_UFFS */
 
 #define RT_USING_DFS_NFS
 #define RT_NFS_HOST_EXPORT		"192.168.1.5:/"

+ 1 - 1
components/dfs/SConscript

@@ -117,7 +117,7 @@ if GetDepend('RT_USING_DFS_DEVFS'):
     src_local = src_local + devfs
     path = path + [RTT_ROOT + '/components/dfs/filesystems/devfs']
 
-if GetDepend('RT_USING_DFS_DEVFS'):
+if GetDepend('RT_USING_DFS_UFFS'):
     src_local = src_local + uffs
     path = path + [RTT_ROOT + '/components/dfs/filesystems/uffs/src/inc', RTT_ROOT + '/components/dfs/filesystems/uffs', RTT_ROOT + '/components/dfs/filesystems/uffs/flash']