From 96383266b41e695351b5a1ae8494354e1b261eb9 Mon Sep 17 00:00:00 2001 From: SummerGift Date: Mon, 9 Oct 2017 17:04:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?429bsp,8g=E7=9A=84sd=E5=8D=A1=E5=8F=AF=E4=BB=A5=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E4=BD=86=E6=98=AF=E5=A4=A7=E5=AE=B9=E9=87=8F?= =?UTF-8?q?32g=E7=9A=84=E5=8D=A1=E6=97=A0=E6=B3=95=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/stm32f429-apollo/.config | 28 +++++++++++++++++++--- bsp/stm32f429-apollo/drivers/drv_nand.h | 2 +- bsp/stm32f429-apollo/drivers/drv_sdio_sd.c | 2 +- bsp/stm32f429-apollo/rtconfig.h | 28 +++++++++++++++++++--- bsp/stm32f429-apollo/template.uvoptx | 4 ++-- bsp/stm32f429-apollo/template.uvprojx | 10 ++++---- 6 files changed, 59 insertions(+), 15 deletions(-) diff --git a/bsp/stm32f429-apollo/.config b/bsp/stm32f429-apollo/.config index 4ba8230ddf..6e19a928f3 100644 --- a/bsp/stm32f429-apollo/.config +++ b/bsp/stm32f429-apollo/.config @@ -72,7 +72,26 @@ CONFIG_FINSH_DEFAULT_PASSWORD="rtthread" # # Device virtual file system # -# CONFIG_RT_USING_DFS is not set +CONFIG_RT_USING_DFS=y +# CONFIG_DFS_USING_WORKDIR is not set +CONFIG_DFS_FILESYSTEMS_MAX=4 +CONFIG_DFS_FD_MAX=16 +CONFIG_RT_USING_DFS_ELMFAT=y +CONFIG_RT_DFS_ELM_CODE_PAGE=437 +CONFIG_RT_DFS_ELM_WORD_ACCESS=y +# CONFIG_RT_DFS_ELM_USE_LFN_0 is not set +# CONFIG_RT_DFS_ELM_USE_LFN_1 is not set +# CONFIG_RT_DFS_ELM_USE_LFN_2 is not set +CONFIG_RT_DFS_ELM_USE_LFN_3=y +CONFIG_RT_DFS_ELM_USE_LFN=3 +CONFIG_RT_DFS_ELM_MAX_LFN=255 +CONFIG_RT_DFS_ELM_DRIVES=2 +CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=4096 +# CONFIG_RT_DFS_ELM_USE_ERASE is not set +CONFIG_RT_DFS_ELM_REENTRANT=y +CONFIG_RT_USING_DFS_DEVFS=y +# CONFIG_RT_USING_DFS_NET is not set +# CONFIG_RT_USING_DFS_NFS is not set # # Device Drivers @@ -88,9 +107,12 @@ CONFIG_RT_USING_I2C_BITOPS=y CONFIG_RT_USING_MTD_NAND=y CONFIG_RT_MTD_NAND_DEBUG=y CONFIG_RT_USING_RTC=y -# CONFIG_RT_USING_SDIO is not set +CONFIG_RT_USING_SDIO=y CONFIG_RT_USING_SPI=y -# CONFIG_RT_USING_SFUD is not set +CONFIG_RT_USING_SFUD=y +CONFIG_RT_SFUD_USING_SFDP=y +CONFIG_RT_SFUD_USING_FLASH_INFO_TABLE=y +CONFIG_RT_SFUD_DEBUG=y # CONFIG_RT_USING_W25QXX is not set # CONFIG_RT_USING_GD is not set # CONFIG_RT_USING_ENC28J60 is not set diff --git a/bsp/stm32f429-apollo/drivers/drv_nand.h b/bsp/stm32f429-apollo/drivers/drv_nand.h index 8fba15ed9c..b55755ec34 100644 --- a/bsp/stm32f429-apollo/drivers/drv_nand.h +++ b/bsp/stm32f429-apollo/drivers/drv_nand.h @@ -108,7 +108,7 @@ uint8_t NAND_ModeSet(uint8_t mode); uint32_t NAND_ReadID(void); uint8_t NAND_ReadStatus(void); uint8_t NAND_WaitForReady(void); -static rt_uint8_t nand_reset(void); +//static rt_uint8_t nand_reset(void); uint8_t NAND_WaitRB(__IO uint8_t rb); void NAND_Delay(volatile rt_uint32_t i); uint8_t NAND_ReadPage(uint32_t PageNum,uint16_t ColNum,uint8_t *pBuffer,uint16_t NumByteToRead); diff --git a/bsp/stm32f429-apollo/drivers/drv_sdio_sd.c b/bsp/stm32f429-apollo/drivers/drv_sdio_sd.c index e1716be0de..e0ae1793d7 100644 --- a/bsp/stm32f429-apollo/drivers/drv_sdio_sd.c +++ b/bsp/stm32f429-apollo/drivers/drv_sdio_sd.c @@ -10,7 +10,7 @@ DMA_HandleTypeDef SDTxDMAHandler,SDRxDMAHandler; //SD //SD卡初始化 //返回值:0 初始化正确；其他值，初始化错误 -rt_uint8_t SD_Init(void) + rt_uint8_t SD_Init(void) { rt_uint8_t SD_Error; diff --git a/bsp/stm32f429-apollo/rtconfig.h b/bsp/stm32f429-apollo/rtconfig.h index 8da6d0a1f8..f8b3a5a6c1 100644 --- a/bsp/stm32f429-apollo/rtconfig.h +++ b/bsp/stm32f429-apollo/rtconfig.h @@ -65,7 +65,26 @@ /* Device virtual file system */ -/* RT_USING_DFS is not set */ +#define RT_USING_DFS +/* DFS_USING_WORKDIR is not set */ +#define DFS_FILESYSTEMS_MAX 4 +#define DFS_FD_MAX 16 +#define RT_USING_DFS_ELMFAT +#define RT_DFS_ELM_CODE_PAGE 437 +#define RT_DFS_ELM_WORD_ACCESS +/* RT_DFS_ELM_USE_LFN_0 is not set */ +/* RT_DFS_ELM_USE_LFN_1 is not set */ +/* RT_DFS_ELM_USE_LFN_2 is not set */ +#define RT_DFS_ELM_USE_LFN_3 +#define RT_DFS_ELM_USE_LFN 3 +#define RT_DFS_ELM_MAX_LFN 255 +#define RT_DFS_ELM_DRIVES 2 +#define RT_DFS_ELM_MAX_SECTOR_SIZE 4096 +/* RT_DFS_ELM_USE_ERASE is not set */ +#define RT_DFS_ELM_REENTRANT +#define RT_USING_DFS_DEVFS +/* RT_USING_DFS_NET is not set */ +/* RT_USING_DFS_NFS is not set */ /* Device Drivers */ @@ -80,9 +99,12 @@ #define RT_USING_MTD_NAND #define RT_MTD_NAND_DEBUG #define RT_USING_RTC -/* RT_USING_SDIO is not set */ +#define RT_USING_SDIO #define RT_USING_SPI -/* RT_USING_SFUD is not set */ +#define RT_USING_SFUD +#define RT_SFUD_USING_SFDP +#define RT_SFUD_USING_FLASH_INFO_TABLE +#define RT_SFUD_DEBUG /* RT_USING_W25QXX is not set */ /* RT_USING_GD is not set */ /* RT_USING_ENC28J60 is not set */ diff --git a/bsp/stm32f429-apollo/template.uvoptx b/bsp/stm32f429-apollo/template.uvoptx index 513cf81782..ad7ef80f6e 100644 --- a/bsp/stm32f429-apollo/template.uvoptx +++ b/bsp/stm32f429-apollo/template.uvoptx @@ -28,7 +28,7 @@ 12000000 - 0 + 1 1 0 1 @@ -77,7 +77,7 @@ 0 1 - 0 + 18 0 diff --git a/bsp/stm32f429-apollo/template.uvprojx b/bsp/stm32f429-apollo/template.uvprojx index 1d23fba5e9..885574f660 100644 --- a/bsp/stm32f429-apollo/template.uvprojx +++ b/bsp/stm32f429-apollo/template.uvprojx @@ -256,17 +256,17 @@ 0x0 - 0 + 1 0x0 0x0 - 0 + 1 0x0 0x0 - 0 + 1 0x0 0x0 @@ -276,7 +276,7 @@ 0x100000 - 0 + 1 0x0 0x0 @@ -322,7 +322,7 @@ 2 0 0 - 0 + 1 0 1 1 -- GitLab