From 0227b5823e39087f4d2f466dc7eec4c8a004bf48 Mon Sep 17 00:00:00 2001
From: Jonne <qzhang1535@gmail.com>
Date: Sat, 11 Apr 2020 17:56:02 +0800
Subject: [PATCH] 1. Remove unuseful function(rt_system_module_init) 2. Modify
 the return code to -1 when failed 3. Change the mounting filesystem from
 ramfs to sdcard 4. Replace RT_USING_RTGUI with PKG_USING_GUIENGINE and remove
 RT_USING_FTK

---
 bsp/mini2440/applications/mnt.c | 21 ++++++++++-----------
 bsp/mini2440/drivers/SConscript | 11 ++++-------
 bsp/mini2440/drivers/board.c    |  7 -------
 bsp/mini2440/drivers/dm9000.c   |  2 ++
 bsp/mini2440/drivers/sdcard.c   |  4 ++--
 5 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/bsp/mini2440/applications/mnt.c b/bsp/mini2440/applications/mnt.c
index fc9f915167..50ade3a3eb 100644
--- a/bsp/mini2440/applications/mnt.c
+++ b/bsp/mini2440/applications/mnt.c
@@ -6,17 +6,16 @@
 
 int mnt_init(void)
 {
-
-    if(dfs_mount(RT_NULL, "/", "ram", 0, dfs_ramfs_create(rt_malloc(1024),1024)) == 0)
-    {
-        rt_kprintf("RAM file system initializated!\n");
-    }
-    else
-    {
-        rt_kprintf("RAM file system initializate failed!\n");
-    }
-
-    return 0;
+	if (dfs_mount("sd0", "/", "elm", 0, 0) == 0)
+	{
+		rt_kprintf("File System initialized!\n");
+	}
+	else
+	{
+		rt_kprintf("File System initialzation failed!\n");
+	}
+   
+	return RT_EOK;
 }
 INIT_ENV_EXPORT(mnt_init);
 #endif
diff --git a/bsp/mini2440/drivers/SConscript b/bsp/mini2440/drivers/SConscript
index 8b36ce3aab..2c81f19e33 100644
--- a/bsp/mini2440/drivers/SConscript
+++ b/bsp/mini2440/drivers/SConscript
@@ -17,16 +17,13 @@ if GetDepend('RT_USING_DFS'):
 if GetDepend('RT_USING_LWIP'):
 	src += ['dm9000.c']
 
-if GetDepend('RT_USING_RTGUI'):
-    	src += ['touch.c', 'key.c']
-
-if GetDepend('RT_USING_FTK'):
-    	src += ['touch.c', 'key.c']
+if GetDepend('PKG_USING_GUIENGINE'):
+    src += ['touch.c', 'key.c']
 
 if GetDepend('RT_USING_RTI'):
-    	src += ['rti_stub.c']
+    src += ['rti_stub.c']
 		
-if GetDepend('RT_USING_RTGUI') or GetDepend('RT_USING_FTK'):
+if GetDepend('PKG_USING_GUIENGINE'):
 	if rtconfig.RT_USING_LCD_TYPE == 'PNL_A70':
 		src += ['lcd_a70.c']
 	elif rtconfig.RT_USING_LCD_TYPE == 'PNL_N35':
diff --git a/bsp/mini2440/drivers/board.c b/bsp/mini2440/drivers/board.c
index 14e2e426df..48df4a3e87 100644
--- a/bsp/mini2440/drivers/board.c
+++ b/bsp/mini2440/drivers/board.c
@@ -125,11 +125,4 @@ void rt_hw_board_init(void)
 #endif
 
 }
-
-#ifdef RT_USING_MODULE
-int rt_system_module_init(void)
-{
-    return 0;
-}
-#endif
 /*@}*/
diff --git a/bsp/mini2440/drivers/dm9000.c b/bsp/mini2440/drivers/dm9000.c
index 22afb322c7..2bdbd43a12 100644
--- a/bsp/mini2440/drivers/dm9000.c
+++ b/bsp/mini2440/drivers/dm9000.c
@@ -642,6 +642,8 @@ int rt_hw_dm9000_init()
 	/* instal interrupt */
 	rt_hw_interrupt_install(INTEINT4_7, INTEINT4_7_handler, RT_NULL, "EINT4_7");
 	rt_hw_interrupt_umask(INTEINT4_7);
+
+	return RT_EOK;
 }
 
 INIT_DEVICE_EXPORT(rt_hw_dm9000_init);
diff --git a/bsp/mini2440/drivers/sdcard.c b/bsp/mini2440/drivers/sdcard.c
index 0f5b79bb25..d20bfe71bb 100644
--- a/bsp/mini2440/drivers/sdcard.c
+++ b/bsp/mini2440/drivers/sdcard.c
@@ -574,7 +574,7 @@ int rt_hw_sdcard_init(void)
         {
             rt_kprintf("allocate partition sector buffer failed\n");
 
-            return RT_ERROR;
+            return -1;
         }
         status = sd_readblock(0, sector);
         if (status == RT_EOK)
@@ -637,7 +637,7 @@ int rt_hw_sdcard_init(void)
         /* release sector buffer */
         rt_free(sector);
 
-        return RT_ERROR; 
+        return -1; 
     }
     else
     {