diff --git a/subsys/settings/Kconfig b/subsys/settings/Kconfig index 0e2e4a29e96..09ca97b494d 100644 --- a/subsys/settings/Kconfig +++ b/subsys/settings/Kconfig @@ -52,14 +52,6 @@ config SETTINGS_FILE help Use a file (on mounted file system) as a settings storage back-end. -config SETTINGS_FS - bool "FS (DEPRECATED)" - depends on FILE_SYSTEM - select SETTINGS_ENCODE_LEN - select DEPRECATED - help - This is deprecated, please use SETTINGS_FILE instead. - config SETTINGS_NVS bool "NVS non-volatile storage support" depends on NVS @@ -125,27 +117,6 @@ config SETTINGS_FILE_MAX_LINES help Limit how many items stored in a file before compressing -config SETTINGS_FS_DIR - string "Serialization directory (DEPRECATED)" - default "/settings" - depends on SETTINGS_FS - help - This is deprecated. Use SETTINGS_FILE_PATH instead. - -config SETTINGS_FS_FILE - string "Default settings file (DEPRECATED)" - default "/settings/run" - depends on SETTINGS_FS - help - This is deprecated. Use SETTINGS_FILE_PATH instead. - -config SETTINGS_FS_MAX_LINES - int "Compression threshold (DEPRECATED)" - default 32 - depends on SETTINGS_FS - help - This is deprecated. Use SETTINGS_FILE_MAX_LINES instead. - config SETTINGS_NVS_SECTOR_SIZE_MULT int "Sector size of the NVS settings area" default 1 diff --git a/subsys/settings/src/CMakeLists.txt b/subsys/settings/src/CMakeLists.txt index 897f4a7efb6..d4ec6e76142 100644 --- a/subsys/settings/src/CMakeLists.txt +++ b/subsys/settings/src/CMakeLists.txt @@ -9,7 +9,6 @@ zephyr_sources( zephyr_sources_ifdef(CONFIG_SETTINGS_RUNTIME settings_runtime.c) zephyr_sources_ifdef(CONFIG_SETTINGS_FILE settings_file.c) -zephyr_sources_ifdef(CONFIG_SETTINGS_FS settings_file.c) zephyr_sources_ifdef(CONFIG_SETTINGS_FCB settings_fcb.c) zephyr_sources_ifdef(CONFIG_SETTINGS_NVS settings_nvs.c) zephyr_sources_ifdef(CONFIG_SETTINGS_NONE settings_none.c) diff --git a/subsys/settings/src/settings_file.c b/subsys/settings/src/settings_file.c index 4f18a75c561..43dcd1004f5 100644 --- a/subsys/settings/src/settings_file.c +++ b/subsys/settings/src/settings_file.c @@ -19,13 +19,8 @@ LOG_MODULE_DECLARE(settings, CONFIG_SETTINGS_LOG_LEVEL); -#ifdef CONFIG_SETTINGS_FS -#define SETTINGS_FILE_MAX_LINES CONFIG_SETTINGS_FS_MAX_LINES -#define SETTINGS_FILE_PATH CONFIG_SETTINGS_FS_FILE -#else #define SETTINGS_FILE_MAX_LINES CONFIG_SETTINGS_FILE_MAX_LINES #define SETTINGS_FILE_PATH CONFIG_SETTINGS_FILE_PATH -#endif int settings_backend_init(void);