Alloc CONFIG_FS_READABLE/WRITABLE to be defined in Kconfig files while preserving backward compatibility with legacy configurations (for the time being)

10 files changed, 25 insertions, 4 deletions

diff --git a/nuttx/drivers/usbdev/Kconfig b/nuttx/drivers/usbdev/Kconfig
index af913385e..f512bd4a7 100644
--- a/nuttx/drivers/usbdev/Kconfig
+++ b/nuttx/drivers/usbdev/Kconfig
@@ -427,6 +427,8 @@ endif
 config USBMSC
 	bool "USB Mass storage class device"
 	default n
+	select FS_READABLE
+	select FS_WRITABLE
 	---help---
 		References:
 		"Universal Serial Bus Mass Storage Class, Specification Overview,"
diff --git a/nuttx/fs/Kconfig b/nuttx/fs/Kconfig
index 5570b26b4..b7f3f059d 100644
--- a/nuttx/fs/Kconfig
+++ b/nuttx/fs/Kconfig
@@ -9,6 +9,14 @@ config DISABLE_MOUNTPOINT
 	bool "Disable support for mount points"
 	default n
 
+config FS_READABLE
+	bool
+	default n
+
+config FS_WRITABLE
+	bool
+	default n
+
 source fs/mmap/Kconfig
 source fs/fat/Kconfig
 source fs/nfs/Kconfig
diff --git a/nuttx/fs/binfs/Kconfig b/nuttx/fs/binfs/Kconfig
index eedbe497d..6ec155f93 100644
--- a/nuttx/fs/binfs/Kconfig
+++ b/nuttx/fs/binfs/Kconfig
@@ -7,6 +7,7 @@ config FS_BINFS
 	bool "BINFS File System"
 	default n
 	depends on BUILTIN
+	select FS_READABLE
 	---help---
 		The BINFS file system is provides access to builtin applications through
 		the NuttX file system.  The BINFS may, for example, be mount at /bin.
diff --git a/nuttx/fs/fat/Kconfig b/nuttx/fs/fat/Kconfig
index 3f322c626..175ddf20d 100644
--- a/nuttx/fs/fat/Kconfig
+++ b/nuttx/fs/fat/Kconfig
@@ -7,6 +7,8 @@ config FS_FAT
 	bool "FAT file system"
 	default n
 	depends on !DISABLE_MOUNTPOINT
+	select FS_READABLE
+	select FS_WRITABLE
 	---help---
 		Enable FAT filesystem support
 
diff --git a/nuttx/fs/nfs/Kconfig b/nuttx/fs/nfs/Kconfig
index 3838efffa..c9d944b64 100644
--- a/nuttx/fs/nfs/Kconfig
+++ b/nuttx/fs/nfs/Kconfig
@@ -7,6 +7,8 @@ config NFS
 	bool "NFS client file system"
 	default n
 	depends on NET && !DISABLE_MOUNTPOINT
+	select FS_READABLE
+	select FS_WRITABLE
 	---help---
 		Enable network file system (NFS) client file system
 
diff --git a/nuttx/fs/nxffs/Kconfig b/nuttx/fs/nxffs/Kconfig
index aa4c603ec..dc05c93df 100644
--- a/nuttx/fs/nxffs/Kconfig
+++ b/nuttx/fs/nxffs/Kconfig
@@ -7,6 +7,8 @@ config FS_NXFFS
 	bool "NXFFS file system"
 	default n
 	depends on !DISABLE_MOUNTPOINT
+	select FS_READABLE
+	select FS_WRITABLE
 	---help---
 		Enable NuttX FLASH file system (NXFF) support.
 
diff --git a/nuttx/fs/procfs/Kconfig b/nuttx/fs/procfs/Kconfig
index 15e4e46da..9f20aa672 100644
--- a/nuttx/fs/procfs/Kconfig
+++ b/nuttx/fs/procfs/Kconfig
@@ -6,8 +6,9 @@
 config FS_PROCFS
 	bool "PROCFS File System"
 	default n
+	select FS_WRITABLE
 	---help---
 		The PROCFS file system is provides access to task status through the
 		NuttX file system.  The PROCFS may, for example, be mount at /proc.
 		Then information about all of the currently active tasks and threads
-		will be available in proc/.
\ No newline at end of file
+		will be available in proc/.
diff --git a/nuttx/fs/romfs/Kconfig b/nuttx/fs/romfs/Kconfig
index 6a91011ab..d7dd79639 100644
--- a/nuttx/fs/romfs/Kconfig
+++ b/nuttx/fs/romfs/Kconfig
@@ -7,6 +7,7 @@ config FS_ROMFS
 	bool "ROMFS file system"
 	default n
 	depends on !DISABLE_MOUNTPOINT
+	select FS_READABLE
 	---help---
 		Enable ROMFS filesystem support
 
diff --git a/nuttx/fs/smartfs/Kconfig b/nuttx/fs/smartfs/Kconfig
index b082092e3..73910d91d 100644
--- a/nuttx/fs/smartfs/Kconfig
+++ b/nuttx/fs/smartfs/Kconfig
@@ -7,6 +7,8 @@ config FS_SMARTFS
 	bool "SMART file system"
 	default n
 	depends on !DISABLE_MOUNTPOINT
+	select FS_READABLE
+	select FS_WRITABLE
 	---help---
 		Enable NuttX SMART Flash file system (SMARTFS) support.
 
diff --git a/nuttx/tools/mkconfig.c b/nuttx/tools/mkconfig.c
index ce1a1a977..18d91e7c7 100644
--- a/nuttx/tools/mkconfig.c
+++ b/nuttx/tools/mkconfig.c
@@ -222,15 +222,15 @@ int main(int argc, char **argv, char **envp)
   printf("# undef CONFIG_NFS\n");
   printf("#endif\n\n");
   printf("/* Check if any readable and writable filesystem (OR USB storage) is supported */\n\n");
-  printf("#undef CONFIG_FS_READABLE\n");
-  printf("#undef CONFIG_FS_WRITABLE\n\n");
   printf("#if defined(CONFIG_FS_FAT) || defined(CONFIG_FS_ROMFS) || defined(CONFIG_USBMSC) || \\\n");
   printf("    defined(CONFIG_FS_NXFFS) || defined(CONFIG_FS_SMARTFS) || defined(CONFIG_FS_BINFS) || \\\n");
-  printf("    defined(CONFIG_NFS)\n");
+  printf("    defined(CONFIG_NFS) || defined(CONFIG_FS_PROCFS)\n");
+  printf("# undef  CONFIG_FS_READABLE\n");
   printf("# define CONFIG_FS_READABLE 1\n");
   printf("#endif\n\n");
   printf("#if defined(CONFIG_FS_FAT) || defined(CONFIG_USBMSC) || defined(CONFIG_FS_NXFFS) || \\\n");
   printf("    defined(CONFIG_FS_SMARTFS) || defined(CONFIG_NFS)\n");
+  printf("# undef  CONFIG_FS_WRITABLE\n");
   printf("# define CONFIG_FS_WRITABLE 1\n");
   printf("#endif\n\n");
   printf("/* There can be no network support with no socket descriptors */\n\n");