yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!97 解决kernel/liteos_a仓下关闭fat，编译不过的问题 

Merge pull request !97 from li_zan/master
This commit is contained in:
openharmony_ci 2021-03-27 09:05:24 +08:00 committed by Gitee
parent 51e587ca44 b75c5f3cca
commit c9f2b730f1
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Kconfig
View File

@ -96,6 +96,7 @@ source "../../kernel/liteos_a/fs/jffs2/Kconfig"
config ENABLE_READ_BUFFER config ENABLE_READ_BUFFER
bool "Enable read buffer Option" bool "Enable read buffer Option"
default n default n
depends on FS_VFS
help help
Answer Y to add enable read buffer Option. Answer Y to add enable read buffer Option.

2
fs/fat/Kconfig
View File

@ -39,5 +39,5 @@ config FS_FAT_VOLUMES
config FS_FAT_DISK config FS_FAT_DISK
bool "Enable partinfo for storage device" bool "Enable partinfo for storage device"
depends on FS_FAT || DRIVERS_MMC || DRIVERS_USB depends on FS_VFS && (FS_FAT || DRIVERS_MMC || DRIVERS_USB)
default y default y

2
fs/include/disk.h
View File

@ -37,7 +37,9 @@
#ifndef _DISK_H #ifndef _DISK_H
#define _DISK_H #define _DISK_H
#include "fs/fs.h"
#include "los_base.h" #include "los_base.h"
#include "pthread.h"
#ifdef LOSCFG_FS_FAT_CACHE #ifdef LOSCFG_FS_FAT_CACHE
#include "bcache.h" #include "bcache.h"

12
kernel/common/los_rootfs.c
View File

@ -37,7 +37,6 @@
#ifdef LOSCFG_DRIVERS_MMC #ifdef LOSCFG_DRIVERS_MMC
#include "mmc/block.h" #include "mmc/block.h"
#include "disk.h" #include "disk.h"
#include "ff.h"
#endif #endif
#include "sys/mount.h" #include "sys/mount.h"
#ifdef LOSCFG_PLATFORM_ROOTFS #ifdef LOSCFG_PLATFORM_ROOTFS
@ -58,17 +57,18 @@
#define STORAGE_SIZE 0xa00000 #define STORAGE_SIZE 0xa00000
#endif #endif
#ifdef LOSCFG_STORAGE_EMMC
#include "ff.h"
#define STORAGE_SIZE 0x3200000
STATIC los_disk *g_emmcDisk = NULL;
#endif
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __cplusplus */ #endif /* __cplusplus */
#ifdef LOSCFG_STORAGE_EMMC
#define STORAGE_SIZE 0x3200000
STATIC los_disk *g_emmcDisk = NULL;
#endif
#ifndef LOSCFG_SECURITY_BOOT #ifndef LOSCFG_SECURITY_BOOT
STATIC INT32 g_alignSize = 0; STATIC INT32 g_alignSize = 0;
#endif #endif