From c6a8014e1cd4dc44edf01a6eac9cc49818f586a2 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sat, 30 Sep 2017 08:49:22 -0400 Subject: [PATCH] subsys: fs: consolidate elm FAT kconfig options Signed-off-by: Anas Nashif --- ext/Kconfig | 2 -- ext/fs/Kconfig | 11 ----------- ext/fs/fat/Kconfig | 7 ------- include/fs/fs_interface.h | 2 +- subsys/fs/Kconfig | 6 +++--- subsys/fs/Makefile | 2 +- tests/bluetooth/shell/arduino_101.conf | 2 +- tests/subsys/fs/fat_fs_api/prj.conf | 3 +-- 8 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 ext/fs/Kconfig delete mode 100644 ext/fs/fat/Kconfig diff --git a/ext/Kconfig b/ext/Kconfig index b6b488c14f1..4242d5e0c3f 100644 --- a/ext/Kconfig +++ b/ext/Kconfig @@ -12,8 +12,6 @@ source "ext/hal/Kconfig" source "ext/lib/crypto/Kconfig" -source "ext/fs/Kconfig" - source "ext/debug/Kconfig" endmenu diff --git a/ext/fs/Kconfig b/ext/fs/Kconfig deleted file mode 100644 index 4d01262894c..00000000000 --- a/ext/fs/Kconfig +++ /dev/null @@ -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" diff --git a/ext/fs/fat/Kconfig b/ext/fs/fat/Kconfig deleted file mode 100644 index 1c77405f9b7..00000000000 --- a/ext/fs/fat/Kconfig +++ /dev/null @@ -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. diff --git a/include/fs/fs_interface.h b/include/fs/fs_interface.h index e4594d71f5d..d47c698a359 100644 --- a/include/fs/fs_interface.h +++ b/include/fs/fs_interface.h @@ -41,7 +41,7 @@ extern "C" { _dir_object; \ } -#ifdef CONFIG_FILE_SYSTEM_FAT +#ifdef CONFIG_FAT_FILESYSTEM_ELM #include #elif CONFIG_FILE_SYSTEM_NFFS #include diff --git a/subsys/fs/Kconfig b/subsys/fs/Kconfig index 62a8b66f423..9545b19a6fe 100644 --- a/subsys/fs/Kconfig +++ b/subsys/fs/Kconfig @@ -24,10 +24,10 @@ config NO_FS help No file system choosen. -config FILE_SYSTEM_FAT - bool "FAT file system support" +config FAT_FILESYSTEM_ELM + bool "ELM FAT File System" help - Enables FAT file system support. + Use the ELM FAT File system implementation. config FILE_SYSTEM_NFFS bool "NFFS file system support" diff --git a/subsys/fs/Makefile b/subsys/fs/Makefile index 344ac2b9eef..e5dee973449 100644 --- a/subsys/fs/Makefile +++ b/subsys/fs/Makefile @@ -1,3 +1,3 @@ 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 diff --git a/tests/bluetooth/shell/arduino_101.conf b/tests/bluetooth/shell/arduino_101.conf index 9b690e5e46e..225f4647bb0 100644 --- a/tests/bluetooth/shell/arduino_101.conf +++ b/tests/bluetooth/shell/arduino_101.conf @@ -19,6 +19,6 @@ CONFIG_FLASH=y CONFIG_SPI=y CONFIG_GPIO=y CONFIG_FILE_SYSTEM=y -CONFIG_FILE_SYSTEM_FAT=y +CONFIG_FAT_FILESYSTEM_ELM=y CONFIG_DISK_ACCESS_FLASH=y CONFIG_FILE_SYSTEM_SHELL=y diff --git a/tests/subsys/fs/fat_fs_api/prj.conf b/tests/subsys/fs/fat_fs_api/prj.conf index 1d5f028bc63..ad96602ce64 100644 --- a/tests/subsys/fs/fat_fs_api/prj.conf +++ b/tests/subsys/fs/fat_fs_api/prj.conf @@ -1,7 +1,6 @@ CONFIG_FILE_SYSTEM=y -CONFIG_FILE_SYSTEM_FAT=y +CONFIG_FAT_FILESYSTEM_ELM=y CONFIG_DISK_ACCESS_FLASH=y CONFIG_SPI=y CONFIG_GPIO=y - CONFIG_ZTEST=y