bsp: artpi2: add sd card filesystem support.

Signed-off-by: stranding <[email protected]>

Author: StrandingNeko

bsp/stm32/libraries/HAL_Drivers/drivers/SConscript

@@ -110,7 +110,7 @@ if GetDepend(['BSP_USING_WDT']):
     src += ['drv_wdt.c']
 
 if GetDepend(['BSP_USING_SDIO']):
-    if GetDepend('SOC_SERIES_STM32H7') or GetDepend('SOC_SERIES_STM32F7') or GetDepend('SOC_SERIES_STM32L4') or GetDepend('SOC_SERIES_STM32L5'):
+    if GetDepend('SOC_SERIES_STM32H7RS') or GetDepend('SOC_SERIES_STM32H7') or GetDepend('SOC_SERIES_STM32F7') or GetDepend('SOC_SERIES_STM32L4') or GetDepend('SOC_SERIES_STM32L5'):
         src += ['drv_sdmmc.c']
     else:
         src += ['drv_sdio.c']

bsp/stm32/libraries/HAL_Drivers/drivers/drv_sdmmc.c

@@ -269,7 +269,11 @@ static void rthw_sdio_send_command(struct rthw_sdio *sdio, struct sdio_pkg *pkg)
         hsd->DTIMER = HW_SDIO_DATATIMEOUT;
         hsd->DLEN = data->blks * data->blksize;
         hsd->DCTRL = (get_order(data->blksize) << 4) | (data->flags & DATA_DIR_READ ? SDMMC_DCTRL_DTDIR : 0);
-        hsd->IDMABASE0 = (rt_uint32_t)cache_buf;
+        #ifndef SOC_SERIES_STM32H7RS
+            hsd->IDMABASE0 = (rt_uint32_t)cache_buf;
+        #else
+            hsd->IDMABASER = (rt_uint32_t)cache_buf;
+        #endif
         hsd->IDMACTRL = SDMMC_IDMA_IDMAEN;
     }
      /* config cmd reg */
@@ -648,7 +652,11 @@ struct rt_mmcsd_host *sdio_host_create(struct stm32_sdio_des *sdio_des)
   */
 static rt_uint32_t stm32_sdio_clock_get(void)
 {
-    return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SDMMC);
+    #ifndef SOC_SERIES_STM32H7RS
+        return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SDMMC);
+    #else
+        return HAL_RCCEx_GetPeriphCLKFreq(RCC_PERIPHCLK_SDMMC12);
+    #endif
 }
 
 void SDMMC1_IRQHandler(void)

bsp/stm32/stm32h7r7-artpi2/board/Kconfig

@@ -32,6 +32,19 @@ endmenu
 
 menu "On-chip Peripheral Drivers"
 
+    config BSP_USING_SDIO
+        bool "Enable SDIO"
+        default n
+        select RT_USING_SDIO
+        if BSP_USING_SDIO
+            config BSP_USING_SDIO1
+                bool "Enable SDIO1"
+                default n
+            config BSP_USING_SDIO2
+                bool "Enable SDIO2"
+                default n
+        endif
+
     config BSP_USING_GPIO
         bool "Enable GPIO"
         select RT_USING_PIN

bsp/stm32/stm32h7r7-artpi2/board/port/filesystem.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006-2022, RT-Thread Development Team
+ * Copyright (c) 2006-2018, RT-Thread Development Team
  *
  * SPDX-License-Identifier: Apache-2.0
  *
@@ -13,71 +13,51 @@
 
 #ifdef BSP_USING_FS
 #if DFS_FILESYSTEMS_MAX < 4
-    #error "Please define DFS_FILESYSTEMS_MAX more than 4"
+#error "Please define DFS_FILESYSTEMS_MAX more than 4"
 #endif
 #if DFS_FILESYSTEM_TYPES_MAX < 4
-    #error "Please define DFS_FILESYSTEM_TYPES_MAX more than 4"
+#error "Please define DFS_FILESYSTEM_TYPES_MAX more than 4"
 #endif
 
-#include <dfs_fs.h>
-
-#ifdef BSP_USING_SDCARD_FS
-    #include <board.h>
-    #include "drv_sdio.h"
-#endif
 #ifdef BSP_USING_SPI_FLASH_FS
-    #include "fal.h"
+#include "fal.h"
 #endif
-#define DBG_TAG "app.filesystem"
-#define DBG_LVL DBG_INFO
-#include <rtdbg.h>
-
 
+#include <dfs_fs.h>
 #include "dfs_romfs.h"
+#include "drv_sdmmc.h"
 
-#ifdef RT_USING_DFS_ELMFAT
-static const struct romfs_dirent _romfs_root[] =
-{
-    {ROMFS_DIRENT_DIR, "flash", RT_NULL, 0},
-    {ROMFS_DIRENT_DIR, "sdcard", RT_NULL, 0},
-    {ROMFS_DIRENT_DIR, "filesystem", RT_NULL, 0}
-};
-#else
-static const struct romfs_dirent _romfs_root[] =
-{
-    {ROMFS_DIRENT_DIR, "flash", RT_NULL, 0},
-    {ROMFS_DIRENT_DIR, "sdcard", RT_NULL, 0}
-};
-#endif
+#define DBG_TAG "app.filesystem"
+#define DBG_LVL DBG_INFO
+#include <rtdbg.h>
 
-const struct romfs_dirent romfs_root =
-{
-    ROMFS_DIRENT_DIR, "/", (rt_uint8_t *)_romfs_root, sizeof(_romfs_root) / sizeof(_romfs_root[0])
-};
+static const struct romfs_dirent _romfs_root[] = {
+//    {ROMFS_DIRENT_DIR, "flash", RT_NULL, 0},
+    {ROMFS_DIRENT_DIR, "sdcard", RT_NULL, 0}};
 
+const struct romfs_dirent romfs_root = {
+    ROMFS_DIRENT_DIR, "/", (rt_uint8_t *)_romfs_root, sizeof(_romfs_root) / sizeof(_romfs_root[0])};
 
 #ifdef BSP_USING_SDCARD_FS
 
 /* SD Card hot plug detection pin */
-#define SD_CHECK_PIN GET_PIN(D, 5)
+#define SD_CHECK_PIN GET_PIN(N, 7)
 
 static void _sdcard_mount(void)
 {
     rt_device_t device;
 
-    device = rt_device_find("sd");
-
+    device = rt_device_find("sd0");
     if (device == NULL)
     {
         mmcsd_wait_cd_changed(0);
-        sdcard_change();
+        stm32_mmcsd_change();
         mmcsd_wait_cd_changed(RT_WAITING_FOREVER);
-        device = rt_device_find("sd");
+        device = rt_device_find("sd0");
     }
-
     if (device != RT_NULL)
     {
-        if (dfs_mount("sd", "/sdcard", "elm", 0, 0) == RT_EOK)
+        if (dfs_mount("sd0", "/sdcard", "elm", 0, 0) == RT_EOK)
         {
             LOG_I("sd card mount to '/sdcard'");
         }
@@ -95,24 +75,21 @@ static void _sdcard_unmount(void)
     LOG_I("Unmount \"/sdcard\"");
 
     mmcsd_wait_cd_changed(0);
-    sdcard_change();
+    stm32_mmcsd_change();
     mmcsd_wait_cd_changed(RT_WAITING_FOREVER);
 }
 
 static void sd_mount(void *parameter)
 {
     rt_uint8_t re_sd_check_pin = 1;
     rt_thread_mdelay(200);
-
     if (rt_pin_read(SD_CHECK_PIN))
     {
         _sdcard_mount();
     }
-
     while (1)
     {
         rt_thread_mdelay(200);
-
         if (!re_sd_check_pin && (re_sd_check_pin = rt_pin_read(SD_CHECK_PIN)) != 0)
         {
             _sdcard_mount();
@@ -129,54 +106,26 @@ static void sd_mount(void *parameter)
 
 int mount_init(void)
 {
-    #ifdef RT_USING_DFS_ROMFS
     if (dfs_mount(RT_NULL, "/", "rom", 0, &(romfs_root)) != 0)
     {
         LOG_E("rom mount to '/' failed!");
     }
-    #endif
-
-    #ifdef BSP_USING_SPI_FLASH_FS
+#ifdef BSP_USING_SPI_FLASH_FS
     struct rt_device *flash_dev = RT_NULL;
 
-    #ifndef RT_USING_WIFI
+#ifndef RT_USING_WIFI
     fal_init();
-    #endif
+#endif
 
     flash_dev = fal_mtd_nor_device_create("filesystem");
 
-    #ifdef RT_USING_DFS_ELMFAT
-    flash_dev = fal_blk_device_create("filesystem");
-    if (flash_dev)
-    {
-        //mount filesystem
-        if (dfs_mount(flash_dev->parent.name, "/filesystem", "elm", 0, 0) != 0)
-        {
-            LOG_W("mount to '/filesystem' failed! try to mkfs %s", flash_dev->parent.name);
-            dfs_mkfs("elm", flash_dev->parent.name);
-            if (dfs_mount(flash_dev->parent.name, "/filesystem", "elm", 0, 0) == 0)
-            {
-                LOG_I("mount to '/filesystem' success!");
-            }
-        }
-        else
-        {
-            LOG_I("mount to '/filesystem' success!");
-        }
-    }
-    else
-    {
-        LOG_E("Can't create block device filesystem or bt_image partition.");
-    }
-    #else
     if (flash_dev)
     {
         //mount filesystem
         if (dfs_mount(flash_dev->parent.name, "/flash", "lfs", 0, 0) != 0)
         {
             LOG_W("mount to '/flash' failed! try to mkfs %s", flash_dev->parent.name);
             dfs_mkfs("lfs", flash_dev->parent.name);
-
             if (dfs_mount(flash_dev->parent.name, "/flash", "lfs", 0, 0) == 0)
             {
                 LOG_I("mount to '/flash' success!");
@@ -189,20 +138,18 @@ int mount_init(void)
     }
     else
     {
-        LOG_E("Can't create block device filesystem or bt_image partition.");
+        LOG_E("Can't create  block device  filesystem or bt_image partition.");
     }
-    #endif
 
-    #endif
+#endif
 
-    #ifdef BSP_USING_SDCARD_FS
+#ifdef BSP_USING_SDCARD_FS
     rt_thread_t tid;
 
     rt_pin_mode(SD_CHECK_PIN, PIN_MODE_INPUT_PULLUP);
 
     tid = rt_thread_create("sd_mount", sd_mount, RT_NULL,
                            2048, RT_THREAD_PRIORITY_MAX - 2, 20);
-
     if (tid != RT_NULL)
     {
         rt_thread_startup(tid);
@@ -211,8 +158,7 @@ int mount_init(void)
     {
         LOG_E("create sd_mount thread err!");
     }
-
-    #endif
+#endif
     return RT_EOK;
 }
 INIT_APP_EXPORT(mount_init);