From 6352d6e1dac9df364e4d930adc3ccf9198f59e46 Mon Sep 17 00:00:00 2001 From: lzl Date: Tue, 8 Jun 2021 09:07:04 +0000 Subject: [PATCH 1/3] kernel adapter Signed-off-by: lzl --- fs/vfs/disk/disk.c | 12 +++++------- kernel/common/los_rootfs.c | 13 ++++++++----- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/fs/vfs/disk/disk.c b/fs/vfs/disk/disk.c index c131ffc3..d03ce62d 100644 --- a/fs/vfs/disk/disk.c +++ b/fs/vfs/disk/disk.c @@ -35,14 +35,8 @@ #include "unistd.h" #include "sys/mount.h" #include "linux/spinlock.h" - #include "fs/path_cache.h" -#ifdef LOSCFG_DRIVERS_MMC -#include "mmc/block.h" -#endif - - los_disk g_sysDisk[SYS_MAX_DISK]; los_part g_sysPart[SYS_MAX_PART]; @@ -1685,13 +1679,17 @@ VOID show_part(los_part *part) PRINTK("part sec count : %llu\n", part->sector_count); } +#ifdef LOSCFG_DRIVERS_MMC +ssize_t StorageBlockMmcErase(uint32_t blockId, size_t secStart, size_t secNr); +#endif + INT32 EraseDiskByID(UINT32 diskID, size_t startSector, UINT32 sectors) { INT32 ret = VFS_ERROR; #ifdef LOSCFG_DRIVERS_MMC los_disk *disk = get_disk((INT32)diskID); if (disk != NULL) { - ret = do_mmc_erase(diskID, startSector, sectors); + ret = StorageBlockMmcErase(diskID, startSector, sectors); } #endif diff --git a/kernel/common/los_rootfs.c b/kernel/common/los_rootfs.c index 9db34881..dd4ef1b9 100644 --- a/kernel/common/los_rootfs.c +++ b/kernel/common/los_rootfs.c @@ -35,7 +35,6 @@ #include "mtd_partition.h" #endif #ifdef LOSCFG_DRIVERS_MMC -#include "mmc/block.h" #include "disk.h" #endif #include "sys/mount.h" @@ -103,18 +102,22 @@ los_disk *GetMmcDisk(UINT8 type) #endif #ifdef LOSCFG_STORAGE_EMMC +struct disk_divide_info *StorageBlockGetEmmc(void); +struct block_operations *StorageBlockGetMmcOps(void); +char *StorageBlockGetEmmcNodeName(void *block); + STATIC const CHAR *AddEmmcRootfsPart(INT32 rootAddr, INT32 rootSize) { INT32 ret; - struct mmc_block *block = (struct mmc_block *)((struct drv_data *)g_emmcDisk->dev->data)->priv; - const char *node_name = mmc_block_get_node_name(block); + void *block = ((struct drv_data *)g_emmcDisk->dev->data)->priv; + const char *node_name = StorageBlockGetEmmcNodeName(block); if (los_disk_deinit(g_emmcDisk->disk_id) != ENOERR) { PRINT_ERR("Failed to deinit emmc disk!\n"); return NULL; } - struct disk_divide_info *emmc = get_emmc(); + struct disk_divide_info *emmc = StorageBlockGetEmmc(); ret = add_mmc_partition(emmc, rootAddr / EMMC_SEC_SIZE, rootSize / EMMC_SEC_SIZE); if (ret != LOS_OK) { PRINT_ERR("Failed to add mmc root partition!\n"); @@ -138,7 +141,7 @@ STATIC const CHAR *AddEmmcRootfsPart(INT32 rootAddr, INT32 rootSize) PRINT_ERR("Failed to alloc disk %s!\n", node_name); return NULL; } - if (los_disk_init(node_name, mmc_block_get_bops(block), (void *)block, diskId, emmc) != ENOERR) { + if (los_disk_init(node_name, StorageBlockGetMmcOps(), block, diskId, emmc) != ENOERR) { PRINT_ERR("Failed to init emmc disk!\n"); return NULL; } From e5ba92b4b9a7fe1a1d20b45aa84000d737623ae0 Mon Sep 17 00:00:00 2001 From: lzl Date: Tue, 8 Jun 2021 09:50:36 +0000 Subject: [PATCH 2/3] mmc kernel adapter Signed-off-by: lzl --- tools/build/config/debug/hispark_aries.config | 2 ++ tools/build/config/debug/hispark_aries_clang.config | 4 +++- tools/build/config/debug/hispark_taurus.config | 2 ++ tools/build/config/debug/hispark_taurus_clang.config | 2 ++ tools/build/config/debug/hispark_taurus_clang_tee.config | 2 ++ tools/build/config/debug/ipcamera_hi3516dv300_liteos.config | 2 ++ .../config/debug/ipcamera_hi3516dv300_liteos_clang.config | 2 ++ .../config/debug/ipcamera_hi3516dv300_liteos_clang_tee.config | 2 ++ tools/build/config/debug/ipcamera_hi3518ev300_liteos.config | 2 ++ .../config/debug/ipcamera_hi3518ev300_liteos_clang.config | 2 ++ tools/build/config/hispark_aries_clang_release.config | 2 ++ tools/build/config/hispark_aries_debug_shell.config | 2 ++ tools/build/config/hispark_aries_release.config | 2 ++ tools/build/config/hispark_taurus_clang_release.config | 2 ++ tools/build/config/hispark_taurus_clang_release_tee.config | 2 ++ tools/build/config/hispark_taurus_debug_shell.config | 2 ++ tools/build/config/hispark_taurus_debug_shell_tee.config | 2 ++ tools/build/config/hispark_taurus_release.config | 2 ++ tools/build/config/hispark_taurus_release_tee.config | 2 ++ .../config/ipcamera_hi3516dv300_liteos_clang_release.config | 2 ++ .../ipcamera_hi3516dv300_liteos_clang_release_tee.config | 2 ++ .../config/ipcamera_hi3516dv300_liteos_debug_shell.config | 2 ++ .../config/ipcamera_hi3516dv300_liteos_debug_shell_tee.config | 2 ++ tools/build/config/ipcamera_hi3516dv300_liteos_release.config | 2 ++ .../config/ipcamera_hi3516dv300_liteos_release_tee.config | 2 ++ .../config/ipcamera_hi3518ev300_liteos_clang_release.config | 2 ++ .../config/ipcamera_hi3518ev300_liteos_debug_shell.config | 2 ++ tools/build/config/ipcamera_hi3518ev300_liteos_release.config | 2 ++ 28 files changed, 57 insertions(+), 1 deletion(-) diff --git a/tools/build/config/debug/hispark_aries.config b/tools/build/config/debug/hispark_aries.config index 772b3f04..e57a7a26 100644 --- a/tools/build/config/debug/hispark_aries.config +++ b/tools/build/config/debug/hispark_aries.config @@ -24,10 +24,12 @@ LOSCFG_DRIVERS_HDF_PLATFORM_SPI=y LOSCFG_DRIVERS_HDF_PLATFORM_GPIO=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_WIFI=y LOSCFG_DRIVERS_HI3881=y LOSCFG_DRIVERS_HDF_USB=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/debug/hispark_aries_clang.config b/tools/build/config/debug/hispark_aries_clang.config index ad900b69..9b54c779 100644 --- a/tools/build/config/debug/hispark_aries_clang.config +++ b/tools/build/config/debug/hispark_aries_clang.config @@ -23,11 +23,13 @@ LOSCFG_DRIVERS_HDF_PLATFORM_SPI=y LOSCFG_DRIVERS_HDF_PLATFORM_GPIO=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_WIFI=y LOSCFG_DRIVERS_HI3881=y LOSCFG_DRIVERS_HDF_USB=y -LOSCFG_DRIVERS_HDF_TEST=y +LOSCFG_DRIVERS_HDF_TEST=yi +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/debug/hispark_taurus.config b/tools/build/config/debug/hispark_taurus.config index 4bee1095..9a5bc1cb 100644 --- a/tools/build/config/debug/hispark_taurus.config +++ b/tools/build/config/debug/hispark_taurus.config @@ -27,6 +27,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -38,6 +39,7 @@ LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/debug/hispark_taurus_clang.config b/tools/build/config/debug/hispark_taurus_clang.config index 8cd85850..b82c6764 100644 --- a/tools/build/config/debug/hispark_taurus_clang.config +++ b/tools/build/config/debug/hispark_taurus_clang.config @@ -26,6 +26,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -38,6 +39,7 @@ LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/debug/hispark_taurus_clang_tee.config b/tools/build/config/debug/hispark_taurus_clang_tee.config index 03dff370..b61bc4e2 100644 --- a/tools/build/config/debug/hispark_taurus_clang_tee.config +++ b/tools/build/config/debug/hispark_taurus_clang_tee.config @@ -27,6 +27,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -38,6 +39,7 @@ LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_TZDRIVER=y diff --git a/tools/build/config/debug/ipcamera_hi3516dv300_liteos.config b/tools/build/config/debug/ipcamera_hi3516dv300_liteos.config index eb1feba5..f38e1d6a 100644 --- a/tools/build/config/debug/ipcamera_hi3516dv300_liteos.config +++ b/tools/build/config/debug/ipcamera_hi3516dv300_liteos.config @@ -26,6 +26,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -36,6 +37,7 @@ LOSCFG_DRIVERS_HDF_DISP=y LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/debug/ipcamera_hi3516dv300_liteos_clang.config b/tools/build/config/debug/ipcamera_hi3516dv300_liteos_clang.config index 05e8c829..77e45903 100644 --- a/tools/build/config/debug/ipcamera_hi3516dv300_liteos_clang.config +++ b/tools/build/config/debug/ipcamera_hi3516dv300_liteos_clang.config @@ -24,6 +24,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -34,6 +35,7 @@ LOSCFG_DRIVERS_HDF_DISP=y LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/debug/ipcamera_hi3516dv300_liteos_clang_tee.config b/tools/build/config/debug/ipcamera_hi3516dv300_liteos_clang_tee.config index d7c5566f..5968dad5 100644 --- a/tools/build/config/debug/ipcamera_hi3516dv300_liteos_clang_tee.config +++ b/tools/build/config/debug/ipcamera_hi3516dv300_liteos_clang_tee.config @@ -25,6 +25,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -35,6 +36,7 @@ LOSCFG_DRIVERS_HDF_DISP=y LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_TZDRIVER=y diff --git a/tools/build/config/debug/ipcamera_hi3518ev300_liteos.config b/tools/build/config/debug/ipcamera_hi3518ev300_liteos.config index 655891d1..69d378d9 100644 --- a/tools/build/config/debug/ipcamera_hi3518ev300_liteos.config +++ b/tools/build/config/debug/ipcamera_hi3518ev300_liteos.config @@ -24,10 +24,12 @@ LOSCFG_DRIVERS_HDF_PLATFORM_SPI=y LOSCFG_DRIVERS_HDF_PLATFORM_GPIO=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_WIFI=y LOSCFG_DRIVERS_HI3881=y LOSCFG_DRIVERS_HDF_USB=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/debug/ipcamera_hi3518ev300_liteos_clang.config b/tools/build/config/debug/ipcamera_hi3518ev300_liteos_clang.config index 5c9f4535..70f46d63 100644 --- a/tools/build/config/debug/ipcamera_hi3518ev300_liteos_clang.config +++ b/tools/build/config/debug/ipcamera_hi3518ev300_liteos_clang.config @@ -22,10 +22,12 @@ LOSCFG_DRIVERS_HDF_PLATFORM_SPI=y LOSCFG_DRIVERS_HDF_PLATFORM_GPIO=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_WIFI=y LOSCFG_DRIVERS_HI3881=y LOSCFG_DRIVERS_HDF_USB=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/hispark_aries_clang_release.config b/tools/build/config/hispark_aries_clang_release.config index 53d622bf..1a31ee2a 100644 --- a/tools/build/config/hispark_aries_clang_release.config +++ b/tools/build/config/hispark_aries_clang_release.config @@ -21,10 +21,12 @@ LOSCFG_DRIVERS_HDF_PLATFORM_SPI=y LOSCFG_DRIVERS_HDF_PLATFORM_GPIO=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_WIFI=y LOSCFG_DRIVERS_HI3881=y LOSCFG_DRIVERS_HDF_USB=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/hispark_aries_debug_shell.config b/tools/build/config/hispark_aries_debug_shell.config index 772b3f04..e57a7a26 100644 --- a/tools/build/config/hispark_aries_debug_shell.config +++ b/tools/build/config/hispark_aries_debug_shell.config @@ -24,10 +24,12 @@ LOSCFG_DRIVERS_HDF_PLATFORM_SPI=y LOSCFG_DRIVERS_HDF_PLATFORM_GPIO=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_WIFI=y LOSCFG_DRIVERS_HI3881=y LOSCFG_DRIVERS_HDF_USB=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/hispark_aries_release.config b/tools/build/config/hispark_aries_release.config index e7c564cb..2bdc4dea 100644 --- a/tools/build/config/hispark_aries_release.config +++ b/tools/build/config/hispark_aries_release.config @@ -20,10 +20,12 @@ LOSCFG_DRIVERS_HDF_PLATFORM_SPI=y LOSCFG_DRIVERS_HDF_PLATFORM_GPIO=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_WIFI=y LOSCFG_DRIVERS_HI3881=y LOSCFG_DRIVERS_HDF_USB=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/hispark_taurus_clang_release.config b/tools/build/config/hispark_taurus_clang_release.config index 4f0f51ea..3076dd4f 100644 --- a/tools/build/config/hispark_taurus_clang_release.config +++ b/tools/build/config/hispark_taurus_clang_release.config @@ -24,6 +24,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -35,6 +36,7 @@ LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/hispark_taurus_clang_release_tee.config b/tools/build/config/hispark_taurus_clang_release_tee.config index d920789e..dc2a5de8 100644 --- a/tools/build/config/hispark_taurus_clang_release_tee.config +++ b/tools/build/config/hispark_taurus_clang_release_tee.config @@ -25,6 +25,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -36,6 +37,7 @@ LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_TZDRIVER=y diff --git a/tools/build/config/hispark_taurus_debug_shell.config b/tools/build/config/hispark_taurus_debug_shell.config index b0965c3c..ccb76c5d 100644 --- a/tools/build/config/hispark_taurus_debug_shell.config +++ b/tools/build/config/hispark_taurus_debug_shell.config @@ -26,6 +26,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -38,6 +39,7 @@ LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/hispark_taurus_debug_shell_tee.config b/tools/build/config/hispark_taurus_debug_shell_tee.config index a3ee089a..730c986b 100644 --- a/tools/build/config/hispark_taurus_debug_shell_tee.config +++ b/tools/build/config/hispark_taurus_debug_shell_tee.config @@ -27,6 +27,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -39,6 +40,7 @@ LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_TZDRIVER=y diff --git a/tools/build/config/hispark_taurus_release.config b/tools/build/config/hispark_taurus_release.config index c7a42fa0..83d0d4f0 100644 --- a/tools/build/config/hispark_taurus_release.config +++ b/tools/build/config/hispark_taurus_release.config @@ -23,6 +23,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -34,6 +35,7 @@ LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/hispark_taurus_release_tee.config b/tools/build/config/hispark_taurus_release_tee.config index df3a8e52..46a2d492 100644 --- a/tools/build/config/hispark_taurus_release_tee.config +++ b/tools/build/config/hispark_taurus_release_tee.config @@ -24,6 +24,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -35,6 +36,7 @@ LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_TZDRIVER=y diff --git a/tools/build/config/ipcamera_hi3516dv300_liteos_clang_release.config b/tools/build/config/ipcamera_hi3516dv300_liteos_clang_release.config index 18ed73cc..28705aa1 100644 --- a/tools/build/config/ipcamera_hi3516dv300_liteos_clang_release.config +++ b/tools/build/config/ipcamera_hi3516dv300_liteos_clang_release.config @@ -19,6 +19,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -29,6 +30,7 @@ LOSCFG_DRIVERS_HDF_DISP=y LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/ipcamera_hi3516dv300_liteos_clang_release_tee.config b/tools/build/config/ipcamera_hi3516dv300_liteos_clang_release_tee.config index df2abca4..8fa4372f 100644 --- a/tools/build/config/ipcamera_hi3516dv300_liteos_clang_release_tee.config +++ b/tools/build/config/ipcamera_hi3516dv300_liteos_clang_release_tee.config @@ -20,6 +20,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -30,6 +31,7 @@ LOSCFG_DRIVERS_HDF_DISP=y LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_TZDRIVER=y diff --git a/tools/build/config/ipcamera_hi3516dv300_liteos_debug_shell.config b/tools/build/config/ipcamera_hi3516dv300_liteos_debug_shell.config index 6c2b9e47..567ff213 100644 --- a/tools/build/config/ipcamera_hi3516dv300_liteos_debug_shell.config +++ b/tools/build/config/ipcamera_hi3516dv300_liteos_debug_shell.config @@ -25,6 +25,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -37,6 +38,7 @@ LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y LOSCFG_DRIVERS_HDF_SENSOR=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/ipcamera_hi3516dv300_liteos_debug_shell_tee.config b/tools/build/config/ipcamera_hi3516dv300_liteos_debug_shell_tee.config index 52d48e03..4779c4ac 100644 --- a/tools/build/config/ipcamera_hi3516dv300_liteos_debug_shell_tee.config +++ b/tools/build/config/ipcamera_hi3516dv300_liteos_debug_shell_tee.config @@ -26,6 +26,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -37,6 +38,7 @@ LOSCFG_DRIVERS_HDF_DISP=y LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_TZDRIVER=y diff --git a/tools/build/config/ipcamera_hi3516dv300_liteos_release.config b/tools/build/config/ipcamera_hi3516dv300_liteos_release.config index a0ab25a3..c62d4cb8 100644 --- a/tools/build/config/ipcamera_hi3516dv300_liteos_release.config +++ b/tools/build/config/ipcamera_hi3516dv300_liteos_release.config @@ -23,6 +23,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -33,6 +34,7 @@ LOSCFG_DRIVERS_HDF_DISP=y LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/ipcamera_hi3516dv300_liteos_release_tee.config b/tools/build/config/ipcamera_hi3516dv300_liteos_release_tee.config index a0ab25a3..c62d4cb8 100644 --- a/tools/build/config/ipcamera_hi3516dv300_liteos_release_tee.config +++ b/tools/build/config/ipcamera_hi3516dv300_liteos_release_tee.config @@ -23,6 +23,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_PWM=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y LOSCFG_DRIVERS_HDF_PLATFORM_EMMC=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_PLATFORM_MIPI_DSI=y @@ -33,6 +34,7 @@ LOSCFG_DRIVERS_HDF_DISP=y LOSCFG_DRIVERS_HDF_LCD_ICN9700=y LOSCFG_DRIVERS_HDF_INPUT=y LOSCFG_DRIVERS_HDF_TP_5P5_GT911=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_EMMC=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/ipcamera_hi3518ev300_liteos_clang_release.config b/tools/build/config/ipcamera_hi3518ev300_liteos_clang_release.config index 015e238e..c90af1c4 100644 --- a/tools/build/config/ipcamera_hi3518ev300_liteos_clang_release.config +++ b/tools/build/config/ipcamera_hi3518ev300_liteos_clang_release.config @@ -17,10 +17,12 @@ LOSCFG_DRIVERS_HDF_PLATFORM_SPI=y LOSCFG_DRIVERS_HDF_PLATFORM_GPIO=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_WIFI=y LOSCFG_DRIVERS_HI3881=y LOSCFG_DRIVERS_HDF_USB=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/ipcamera_hi3518ev300_liteos_debug_shell.config b/tools/build/config/ipcamera_hi3518ev300_liteos_debug_shell.config index 6c0ea04f..4cccb6e1 100644 --- a/tools/build/config/ipcamera_hi3518ev300_liteos_debug_shell.config +++ b/tools/build/config/ipcamera_hi3518ev300_liteos_debug_shell.config @@ -24,11 +24,13 @@ LOSCFG_DRIVERS_HDF_PLATFORM_SPI=y LOSCFG_DRIVERS_HDF_PLATFORM_GPIO=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_WIFI=y LOSCFG_DRIVERS_HI3881=y LOSCFG_DRIVERS_HDF_USB=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_HDF_TEST=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_HIEVENT=y diff --git a/tools/build/config/ipcamera_hi3518ev300_liteos_release.config b/tools/build/config/ipcamera_hi3518ev300_liteos_release.config index 326021a5..f323e791 100644 --- a/tools/build/config/ipcamera_hi3518ev300_liteos_release.config +++ b/tools/build/config/ipcamera_hi3518ev300_liteos_release.config @@ -20,10 +20,12 @@ LOSCFG_DRIVERS_HDF_PLATFORM_SPI=y LOSCFG_DRIVERS_HDF_PLATFORM_GPIO=y LOSCFG_DRIVERS_HDF_PLATFORM_WATCHDOG=y LOSCFG_DRIVERS_HDF_PLATFORM_SDIO=y +LOSCFG_DRIVERS_HDF_PLATFORM_MMC=y LOSCFG_DRIVERS_HDF_PLATFORM_RTC=y LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_WIFI=y LOSCFG_DRIVERS_HI3881=y LOSCFG_DRIVERS_HDF_USB=y +LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_HIEVENT=y From 3fa315ab0b380961382e24ff615c598fd86cf56a Mon Sep 17 00:00:00 2001 From: lzl Date: Tue, 8 Jun 2021 09:54:06 +0000 Subject: [PATCH 3/3] mmc kernel adapter Signed-off-by: lzl --- tools/build/config/debug/hispark_aries_clang.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/config/debug/hispark_aries_clang.config b/tools/build/config/debug/hispark_aries_clang.config index 9b54c779..14d98a08 100644 --- a/tools/build/config/debug/hispark_aries_clang.config +++ b/tools/build/config/debug/hispark_aries_clang.config @@ -29,7 +29,7 @@ LOSCFG_DRIVERS_HDF_PLATFORM_HISI_SDK=y LOSCFG_DRIVERS_HDF_WIFI=y LOSCFG_DRIVERS_HI3881=y LOSCFG_DRIVERS_HDF_USB=y -LOSCFG_DRIVERS_HDF_TEST=yi +LOSCFG_DRIVERS_HDF_TEST=y LOSCFG_DRIVERS_HDF_STORAGE=y LOSCFG_DRIVERS_SD=y LOSCFG_DRIVERS_HIEVENT=y