diff --git a/bsp/lpc54608-LPCXpresso/.config b/bsp/lpc54608-LPCXpresso/.config index b8829d0e7..3a1873462 100644 --- a/bsp/lpc54608-LPCXpresso/.config +++ b/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 diff --git a/bsp/lpc54608-LPCXpresso/applications/mnt.c b/bsp/lpc54608-LPCXpresso/applications/mnt.c index 85603fa45..4f87859b5 100644 --- a/bsp/lpc54608-LPCXpresso/applications/mnt.c +++ b/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 */ diff --git a/bsp/lpc54608-LPCXpresso/drivers/Kconfig b/bsp/lpc54608-LPCXpresso/drivers/Kconfig index 235b190f9..52ba279f0 100644 --- a/bsp/lpc54608-LPCXpresso/drivers/Kconfig +++ b/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 -bool "Enable SDRAM" -default y \ No newline at end of file +config BSP_DRV_SDRAM + bool "Enable SDRAM" + default y \ No newline at end of file diff --git a/bsp/lpc54608-LPCXpresso/drivers/board.c b/bsp/lpc54608-LPCXpresso/drivers/board.c index a63c012dc..ae66d9d51 100644 --- a/bsp/lpc54608-LPCXpresso/drivers/board.c +++ b/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 diff --git a/bsp/lpc54608-LPCXpresso/drivers/board.h b/bsp/lpc54608-LPCXpresso/drivers/board.h index abf176991..31c072207 100644 --- a/bsp/lpc54608-LPCXpresso/drivers/board.h +++ b/bsp/lpc54608-LPCXpresso/drivers/board.h @@ -23,11 +23,6 @@ #include -/* disable SDRAM in default */ -#ifndef USE_EXT_SDRAM -#define LPC_EXT_SDRAM 1 -#endif - // // diff --git a/bsp/lpc54608-LPCXpresso/project.uvoptx b/bsp/lpc54608-LPCXpresso/project.uvoptx index a50fe3d54..b4332be81 100644 --- a/bsp/lpc54608-LPCXpresso/project.uvoptx +++ b/bsp/lpc54608-LPCXpresso/project.uvoptx @@ -176,7 +176,7 @@ Applications - 0 + 1 0 0 0 @@ -220,7 +220,7 @@ Drivers - 0 + 1 0 0 0 diff --git a/bsp/lpc54608-LPCXpresso/rtconfig.h b/bsp/lpc54608-LPCXpresso/rtconfig.h index 2ed87c106..a8e050891 100644 --- a/bsp/lpc54608-LPCXpresso/rtconfig.h +++ b/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