michaelh/zephyr
1
0
Fork 0
Code Releases Activity

subsys: fs: consolidate elm FAT kconfig options

Browse source 
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2017-09-30 08:49:22 -04:00 • committed by Anas Nashif
commit c6a8014e1c
8 changed files with 7 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/Kconfig
View file

@ -12,8 +12,6 @@ source "ext/hal/Kconfig"
source "ext/lib/crypto/Kconfig" source "ext/lib/crypto/Kconfig"
source "ext/fs/Kconfig"
source "ext/debug/Kconfig" source "ext/debug/Kconfig"
endmenu endmenu

11
ext/fs/Kconfig
View file

@ -1,11 +0,0 @@
# Kconfig - external file system source code configuration options
#
# Copyright (c) 2016 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
#
# When adding new entries keep the list in alphabetical order
source "ext/fs/fat/Kconfig"

7
ext/fs/fat/Kconfig
View file

@ -1,7 +0,0 @@
config FAT_FILESYSTEM_ELM
bool "ELM FAT File System"
depends on FILE_SYSTEM_FAT
default y
help
Use the ELM FAT File system implementation.

2
include/fs/fs_interface.h
View file

@ -41,7 +41,7 @@ extern "C" {
_dir_object; \ _dir_object; \
} }
#ifdef CONFIG_FILE_SYSTEM_FAT #ifdef CONFIG_FAT_FILESYSTEM_ELM
#include <fs/fat_fs.h> #include <fs/fat_fs.h>
#elif CONFIG_FILE_SYSTEM_NFFS #elif CONFIG_FILE_SYSTEM_NFFS
#include <fs/nffs_fs.h> #include <fs/nffs_fs.h>

6
subsys/fs/Kconfig
View file

@ -24,10 +24,10 @@ config NO_FS
help help
No file system choosen. No file system choosen.
config FILE_SYSTEM_FAT config FAT_FILESYSTEM_ELM
bool "FAT file system support" bool "ELM FAT File System"
help help
Enables FAT file system support. Use the ELM FAT File system implementation.
config FILE_SYSTEM_NFFS config FILE_SYSTEM_NFFS
bool "NFFS file system support" bool "NFFS file system support"

2
subsys/fs/Makefile
View file

@ -1,3 +1,3 @@
obj-$(CONFIG_FILE_SYSTEM_SHELL) += shell.o obj-$(CONFIG_FILE_SYSTEM_SHELL) += shell.o
obj-$(CONFIG_FILE_SYSTEM_FAT) += fat_fs.o obj-$(CONFIG_FAT_FILESYSTEM_ELM) += fat_fs.o
obj-$(CONFIG_FILE_SYSTEM_NFFS) += nffs_fs.o obj-$(CONFIG_FILE_SYSTEM_NFFS) += nffs_fs.o

2
tests/bluetooth/shell/arduino_101.conf
View file

@ -19,6 +19,6 @@ CONFIG_FLASH=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_FILE_SYSTEM=y CONFIG_FILE_SYSTEM=y
CONFIG_FILE_SYSTEM_FAT=y CONFIG_FAT_FILESYSTEM_ELM=y
CONFIG_DISK_ACCESS_FLASH=y CONFIG_DISK_ACCESS_FLASH=y
CONFIG_FILE_SYSTEM_SHELL=y CONFIG_FILE_SYSTEM_SHELL=y

3
tests/subsys/fs/fat_fs_api/prj.conf
View file

@ -1,7 +1,6 @@
CONFIG_FILE_SYSTEM=y CONFIG_FILE_SYSTEM=y
CONFIG_FILE_SYSTEM_FAT=y CONFIG_FAT_FILESYSTEM_ELM=y
CONFIG_DISK_ACCESS_FLASH=y CONFIG_DISK_ACCESS_FLASH=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_GPIO=y CONFIG_GPIO=y
CONFIG_ZTEST=y CONFIG_ZTEST=y