Commit 946f6b5c authored by Jordan Yates's avatar Jordan Yates Committed by Benjamin Cabé
Browse files

fs: allow enabling filesystems with `FILE_SYSTEM_LIB_LINK` 

Update the Kconfig configuration to allow enabling the underlying
filesystems (e.g. exFAT), with only `FILE_SYSTEM_LIB_LINK` enabled.

Signed-off-by: default avatarJordan Yates <jordan@embeint.com>
parent c26656c8

subsys/fs/Kconfig

+18 −13
Changes for subsys/fs/Kconfig: 18 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -22,18 +22,6 @@ config FILE_SYSTEM 


if FILE_SYSTEM



module = FS

module-str = fs

source "subsys/logging/Kconfig.template.log_config"



config APP_LINK_WITH_FS

	bool "Link 'app' with FS"

	default y

	help

	  Add FS header files to the 'app' include path. It may be

	  disabled if the include paths for FS are causing aliasing

	  issues for 'app'.



config FILE_SYSTEM_MAX_TYPES

	int "Maximum number of distinct file system types allowed"

	default 2
@@ -110,11 +98,28 @@ config FUSE_FS_ACCESS 
	help

	  Expose file system partitions to the host system through FUSE.



endif # FILE_SYSTEM



if FILE_SYSTEM_LIB_LINK



config APP_LINK_WITH_FS

	bool "Link 'app' with FS"

	default y

	help

	  Add FS header files to the 'app' include path. It may be

	  disabled if the include paths for FS are causing aliasing

	  issues for 'app'.



# Logging defined here as modules/fs/littlefs/lfs.c expects CONFIG_FS_LOG_LEVEL

module = FS

module-str = fs

source "subsys/logging/Kconfig.template.log_config"



rsource "Kconfig.fatfs"

rsource "Kconfig.littlefs"

rsource "ext2/Kconfig"



endif # FILE_SYSTEM

endif # FILE_SYSTEM_LIB_LINK



rsource "fcb/Kconfig"

rsource "nvs/Kconfig"

subsys/fs/Kconfig.fatfs

+1 −1
Changes for subsys/fs/Kconfig.fatfs: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


config FAT_FILESYSTEM_ELM

	bool "ELM FAT file system support"

	depends on FILE_SYSTEM

	depends on FILE_SYSTEM_LIB_LINK

	select DISK_ACCESS

	help

	  Use the ELM FAT File system implementation.

subsys/fs/Kconfig.littlefs

+1 −1
Changes for subsys/fs/Kconfig.littlefs: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


config FILE_SYSTEM_LITTLEFS

	bool "LittleFS support"

	depends on FILE_SYSTEM

	depends on FILE_SYSTEM_LIB_LINK

	depends on ZEPHYR_LITTLEFS_MODULE

	help

	  Enables LittleFS file system support.

subsys/fs/ext2/CMakeLists.txt

+1 −1
Changes for subsys/fs/ext2/CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ target_include_directories(EXT2 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) 


zephyr_library()

zephyr_library_sources(

  ext2_ops.c

  ext2_impl.c

  ext2_disk_access.c

  ext2_bitmap.c

  ext2_diskops.c

)

zephyr_library_sources_ifdef(CONFIG_FILE_SYSTEM ext2_ops.c)

zephyr_library_sources_ifdef(CONFIG_FILE_SYSTEM_MKFS ext2_format.c)



zephyr_library_link_libraries(EXT2)

subsys/fs/ext2/Kconfig

+1 −1
Changes for subsys/fs/ext2/Kconfig: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


config FILE_SYSTEM_EXT2

	bool "Ext2 file system support"

	depends on FILE_SYSTEM

	depends on FILE_SYSTEM_LIB_LINK

	help

	  Enable Ext2 file system support.

CRA Git | Maintained and supported by SUSTech CRA and CCSE