diff --git a/fs/vfs/disk/disk.c b/fs/vfs/disk/disk.c index c131ffc37f73c00f701b98456916ff7c9731bfa5..d03ce62d53c673a35435cd3fac82d1c37a96d83f 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 9db34881802d75440e12f31d999cd096296cfba1..dd4ef1b95c7c2600275831fca7e8b7d695021d2e 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; } diff --git a/tools/build/config/debug/hispark_aries.config b/tools/build/config/debug/hispark_aries.config index 132357898a4a4111574b87520b4d56202bfcc4f9..e74a83216c8ab9b2e8c602ca4e64df7aaf4cdd92 100644 --- a/tools/build/config/debug/hispark_aries.config +++ b/tools/build/config/debug/hispark_aries.config @@ -23,10 +23,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 f5e566fc94796affe182e23c0ee3e4f6d76de9c7..c45a2e36c4b55224186571d308c7071a1c316638 100644 --- a/tools/build/config/debug/hispark_aries_clang.config +++ b/tools/build/config/debug/hispark_aries_clang.config @@ -22,11 +22,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_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 4bee10953feecf013fec90e382326757911366d2..9a5bc1cbd39b5b0b7bf77e84a47d8f4f769851f6 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 8cd8585015989136c2de52182446a4f0ba44dc57..b82c67641914949df7b351d5008bc318109fa1ba 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 03dff37019203ed9272b6faa8b3e269177ef27bd..b61bc4e2071a46ce237fa74b09a873cf73f48905 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 eb1feba59ce003b5441aef99f1f226a923d83be7..f38e1d6a2d6c1675a35162e650b60ed7bcb67b7e 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 05e8c829cc0c6bde48997042208f47d673ebe072..77e45903c2b48a16950c6f78b1c65f1a5c89caa9 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 d7c5566f0cadc1ddc05a3db0d1dba3449bce33c8..5968dad57ee16fb147c94a85839f0076b41f574e 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 6402dc33798ff934d5abb4a1667536db2c535e74..5297faf85e33b632b7c33dd25049df25db9649b5 100644 --- a/tools/build/config/debug/ipcamera_hi3518ev300_liteos.config +++ b/tools/build/config/debug/ipcamera_hi3518ev300_liteos.config @@ -23,10 +23,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 fb7eb2948fa8aab9fd24f789ff0efe1c87cda32b..48fe5a330e685ef9fa2020554de5a8b2401294e5 100644 --- a/tools/build/config/debug/ipcamera_hi3518ev300_liteos_clang.config +++ b/tools/build/config/debug/ipcamera_hi3518ev300_liteos_clang.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_clang_release.config b/tools/build/config/hispark_aries_clang_release.config index 53d622bf5b00dc105393b8ce6c71d7b57bf7975b..1a31ee2af51d4acec627a723110a970c1ef9a7d2 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 132357898a4a4111574b87520b4d56202bfcc4f9..e74a83216c8ab9b2e8c602ca4e64df7aaf4cdd92 100644 --- a/tools/build/config/hispark_aries_debug_shell.config +++ b/tools/build/config/hispark_aries_debug_shell.config @@ -23,10 +23,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 e7c564cb74aa6485d67fb48c1456c5df7e2c105e..2bdc4dea3956f817d9c8fc9e48be3fe005a6a7e0 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 4f0f51ea0bdc9b7e3f651fdb16929f98932f5df9..3076dd4feea37710dae0ca55c425363510aaa54a 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 d920789eb9d9239b20e6200f755252f96243bb02..dc2a5de8876df7ea971bf726491d940fba2821d7 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 b0965c3cc9ca91535b7b52dab9c5ca5d92bac1a5..ccb76c5d32357f1c851e6ddc1a5b3b2456fdb03a 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 a3ee089ac0803c4a07ce834a979d9a36ecf2b4dd..730c986b24526b2ea3cbc76130a699fbeb7ae0c8 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 c7a42fa0de5eece82989bfa450a1eb646ea6b5de..83d0d4f072dbc4793bf938e63b6fad39a62173ad 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 df3a8e52ff768c83c822c4e5643acabfd9f02b58..46a2d492ccc1a1f2185b98fd90490faa96e575ee 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 18ed73cc9320aff7e56b760e3e7ad75165cd755f..28705aa1cca409668aad8c536ba1edd234d9ced9 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 df2abca462642251129cd70d97ea9d01deccce2c..8fa4372ff56c268b17821bb90968dbd31ce11130 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 6c2b9e471975bcd301e0811f0f1671e9d968fdbf..567ff213211a67164c239a593e26ce9ffbf52c25 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 52d48e03933fdb16526ffec19ee54d7d6ae051c0..4779c4ac8fd9dda5f5277f9661bfb0b981bc25f1 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 a0ab25a39c0fc60d24656cf9f0b9c8ef9be75de1..c62d4cb88f5acb317ca9cc84d3f129670a95a0cb 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 a0ab25a39c0fc60d24656cf9f0b9c8ef9be75de1..c62d4cb88f5acb317ca9cc84d3f129670a95a0cb 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 015e238e565bc27a5d6a8ad5f1646a226647c53d..c90af1c454effd502e5e4bd363ac5ca8369c1aef 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 b8c6883e9e9b2ae344e228f56f4d658af80274ff..bb16c7d2a2ccad02a27f5f949eb8d5735e2087a2 100644 --- a/tools/build/config/ipcamera_hi3518ev300_liteos_debug_shell.config +++ b/tools/build/config/ipcamera_hi3518ev300_liteos_debug_shell.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_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 326021a519a628383755c041ca1441e8b88ef504..f323e791fa5e795b785021f74cfd798e01c052e2 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