Merge remote-tracking branch 'upstream/master'

bsp/lpc54608-LPCXpresso/.config

@@ -257,4 +257,5 @@ CONFIG_LWIP_SO_RCVBUF=1
 #
 # CONFIG_PKG_USING_HELLO is not set
 CONFIG_RT_USING_UART0=y
-CONFIG_USE_EXT_SDRAM=y
+CONFIG_BSP_DRV_SDCARD=y
+CONFIG_BSP_DRV_SDRAM=y

bsp/lpc54608-LPCXpresso/applications/mnt.c

@@ -52,8 +52,10 @@ int mnt_init(void)
     }
 #endif
 
+#ifdef BSP_DRV_SDCARD
     /* initilize sd card */
      mci_hw_init("sd0");
+#endif
 
 #ifdef RT_DFS_ELM_REENTRANT    
     /* mount sd card fat partition 1 as root directory */

bsp/lpc54608-LPCXpresso/drivers/Kconfig

@@ -2,10 +2,10 @@ config RT_USING_UART0
     bool "Enable UART0"
     default y
 
-config RT_DFS_ELM_REENTRANT
+config BSP_DRV_SDCARD
     bool "Enable SD Card"
     default y 
 
-config USE_EXT_SDRAM
+config BSP_DRV_SDRAM
 	bool "Enable SDRAM"
 	default y 

bsp/lpc54608-LPCXpresso/drivers/board.c

@@ -70,7 +70,7 @@ void rt_hw_board_init()
     rt_console_set_device(RT_CONSOLE_DEVICE_NAME);
 #endif
 
-#if LPC_EXT_SDRAM == 1
+#ifdef BSP_DRV_SDRAM
     lpc_sdram_hw_init();
 #endif
 

bsp/lpc54608-LPCXpresso/drivers/board.h

@@ -23,11 +23,6 @@
 
 #include <rtthread.h>
 
-/* disable SDRAM in default */
-#ifndef USE_EXT_SDRAM
-#define LPC_EXT_SDRAM       1
-#endif
-
 // <RDTConfigurator URL="http://www.rt-thread.com/eclipse">
 
 // <integer name="LPC_EXT_SDRAM" description="Begin Address of External SDRAM" default="0xA0000000" />

bsp/lpc54608-LPCXpresso/project.uvoptx

@@ -176,7 +176,7 @@
 
   <Group>
     <GroupName>Applications</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -220,7 +220,7 @@
 
   <Group>
     <GroupName>Drivers</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

bsp/lpc54608-LPCXpresso/rtconfig.h

@@ -230,6 +230,7 @@
 
 /* PKG_USING_HELLO is not set */
 #define RT_USING_UART0
-#define USE_EXT_SDRAM
+#define BSP_DRV_SDCARD
+#define BSP_DRV_SDRAM
 
 #endif