From 7e33a80da53cf5638c1ca21a70ebae89a4a1f67d Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Tue, 31 Mar 2020 10:31:20 +0200
Subject: config: Remove filesystem entry config options

Remove the following undocumented configuration options:

* CONFIGURE_FILESYSTEM_ENTRY_DOSFS

* CONFIGURE_FILESYSTEM_ENTRY_FTPFS

* CONFIGURE_FILESYSTEM_ENTRY_IMFS

* CONFIGURE_FILESYSTEM_ENTRY_JFFS2

* CONFIGURE_FILESYSTEM_ENTRY_NFS

* CONFIGURE_FILESYSTEM_ENTRY_RFS

* CONFIGURE_FILESYSTEM_ENTRY_TFTPFS

Update #3836.
---
 cpukit/include/rtems/confdefs/libio.h | 70 +++++++----------------------------
 1 file changed, 14 insertions(+), 56 deletions(-)

diff --git a/cpukit/include/rtems/confdefs/libio.h b/cpukit/include/rtems/confdefs/libio.h
index 9bac7078c5..e986262e3e 100644
--- a/cpukit/include/rtems/confdefs/libio.h
+++ b/cpukit/include/rtems/confdefs/libio.h
@@ -273,70 +273,28 @@ static const IMFS_mount_data IMFS_root_mount_data = {
   &IMFS_root_mknod_controls
 };
 
-#if defined(CONFIGURE_FILESYSTEM_DOSFS) \
-  && !defined(CONFIGURE_FILESYSTEM_ENTRY_DOSFS)
-  #define CONFIGURE_FILESYSTEM_ENTRY_DOSFS \
-    { RTEMS_FILESYSTEM_TYPE_DOSFS, rtems_dosfs_initialize }
-#endif
-
-#if defined(CONFIGURE_FILESYSTEM_FTPFS) \
-  && !defined(CONFIGURE_FILESYSTEM_ENTRY_FTPFS)
-  #define CONFIGURE_FILESYSTEM_ENTRY_FTPFS \
-    { RTEMS_FILESYSTEM_TYPE_FTPFS, rtems_ftpfs_initialize }
-#endif
-
-#if defined(CONFIGURE_FILESYSTEM_IMFS) \
-  && !defined(CONFIGURE_FILESYSTEM_ENTRY_IMFS)
-  #define CONFIGURE_FILESYSTEM_ENTRY_IMFS \
-    { RTEMS_FILESYSTEM_TYPE_IMFS, IMFS_initialize }
-#endif
-
-#if defined(CONFIGURE_FILESYSTEM_JFFS2) \
-  && !defined(CONFIGURE_FILESYSTEM_ENTRY_JFFS2)
-  #define CONFIGURE_FILESYSTEM_ENTRY_JFFS2 \
-    { RTEMS_FILESYSTEM_TYPE_JFFS2, rtems_jffs2_initialize }
-#endif
-
-#if defined(CONFIGURE_FILESYSTEM_NFS) \
-  && !defined(CONFIGURE_FILESYSTEM_ENTRY_NFS)
-  #define CONFIGURE_FILESYSTEM_ENTRY_NFS \
-    { RTEMS_FILESYSTEM_TYPE_NFS, rtems_nfs_initialize }
-#endif
-
-#if defined(CONFIGURE_FILESYSTEM_RFS) \
-  && !defined(CONFIGURE_FILESYSTEM_ENTRY_RFS)
-  #define CONFIGURE_FILESYSTEM_ENTRY_RFS \
-    { RTEMS_FILESYSTEM_TYPE_RFS, rtems_rfs_rtems_initialise }
-#endif
-
-#if defined(CONFIGURE_FILESYSTEM_TFTPFS) \
-  && !defined(CONFIGURE_FILESYSTEM_ENTRY_TFTPFS)
-  #define CONFIGURE_FILESYSTEM_ENTRY_TFTPFS \
-    { RTEMS_FILESYSTEM_TYPE_TFTPFS, rtems_tftpfs_initialize }
-#endif
-
 const rtems_filesystem_table_t rtems_filesystem_table[] = {
   { "/", IMFS_initialize_support },
-  #ifdef CONFIGURE_FILESYSTEM_ENTRY_DOSFS
-    CONFIGURE_FILESYSTEM_ENTRY_DOSFS,
+  #ifdef CONFIGURE_FILESYSTEM_DOSFS
+    { RTEMS_FILESYSTEM_TYPE_DOSFS, rtems_dosfs_initialize },
   #endif
-  #ifdef CONFIGURE_FILESYSTEM_ENTRY_FTPFS
-    CONFIGURE_FILESYSTEM_ENTRY_FTPFS,
+  #ifdef CONFIGURE_FILESYSTEM_FTPFS
+    { RTEMS_FILESYSTEM_TYPE_FTPFS, rtems_ftpfs_initialize },
   #endif
-  #ifdef CONFIGURE_FILESYSTEM_ENTRY_IMFS
-    CONFIGURE_FILESYSTEM_ENTRY_IMFS,
+  #ifdef CONFIGURE_FILESYSTEM_IMFS
+    { RTEMS_FILESYSTEM_TYPE_IMFS, IMFS_initialize },
   #endif
-  #ifdef CONFIGURE_FILESYSTEM_ENTRY_JFFS2
-    CONFIGURE_FILESYSTEM_ENTRY_JFFS2,
+  #ifdef CONFIGURE_FILESYSTEM_JFFS2
+    { RTEMS_FILESYSTEM_TYPE_JFFS2, rtems_jffs2_initialize },
   #endif
-  #ifdef CONFIGURE_FILESYSTEM_ENTRY_NFS
-    CONFIGURE_FILESYSTEM_ENTRY_NFS,
+  #ifdef CONFIGURE_FILESYSTEM_NFS
+    { RTEMS_FILESYSTEM_TYPE_NFS, rtems_nfs_initialize },
   #endif
-  #ifdef CONFIGURE_FILESYSTEM_ENTRY_RFS
-    CONFIGURE_FILESYSTEM_ENTRY_RFS,
+  #ifdef CONFIGURE_FILESYSTEM_RFS
+    { RTEMS_FILESYSTEM_TYPE_RFS, rtems_rfs_rtems_initialise },
   #endif
-  #ifdef CONFIGURE_FILESYSTEM_ENTRY_TFTPFS
-    CONFIGURE_FILESYSTEM_ENTRY_TFTPFS,
+  #ifdef CONFIGURE_FILESYSTEM_TFTPFS
+    { RTEMS_FILESYSTEM_TYPE_TFTPFS, rtems_tftpfs_initialize },
   #endif
   { NULL, NULL }
 };
-- 
cgit v1.2.3