CONFIG_NFILE_DESCRIPTORS=0 can no longer be used to disable the file system. NuttX with no file system does not make sense.

Squashed commit of the following:

    configs/:  The few configurations that formerly set CONFIG_NFILE_DESCRIPTORS=0 should not default, rather they should set the number of descriptors to 3.
    fs/:  Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
    tools/:  Tools updates for changes to usage of CONFIG_NFILE_DESCRIPTORS.
    syscall/:  Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
    libs/:  Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
    include/:  Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
    drivers/:  Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
    Documentation/:  Remove all references to CONFIG_NFILE_DESCRIPTORS == 0
    binfmt/:  Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
    arch/:  Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
    net/:  Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
    sched/:  Remove all conditional logic based on CONFIG_NFILE_DESCRIPTORS == 0
    sched/Kconfig:  CONFIG_NFILE_DESCRIPTORS may no longer to set to a value less than 3
    configs/:  Remove all settings for CONFIG_NFILE_DESCRIPTORS < 3

Documentation/NfsHowto.html

@@ -77,12 +77,9 @@
 </p>
 <ol>
   <li>
-    First, there are number of things that you must configure in order to be able to use any file system:
+    First, there are things that you must configure in order to be able to use any file system:
   </li>
   <ul>
-    <li>
-      <code>CONFIG_NFILE_DESCRIPTORS > 0</code>.  You must include support for file descriptors.
-    </li>
     <li>
       <code>CONFIG_DISABLE_MOUNTPOINT=n</code>.  You must include support for mount points in the pseudo-file system.
     </li>

Documentation/NuttShell.html

@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttShell (NSH)</i></font></big></h1>
-      <p>Last Updated:  January 19, 2019</p>
+      <p>Last Updated:  February 11, 2019</p>
     </td>
   </tr>
 </table>
@@ -3616,22 +3616,22 @@ nsh&gt;
   </tr>
   <tr>
     <td><b><code>cat</code></b></td>
-    <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
+    <td>&nbsp;</td>
     <td><code>CONFIG_NSH_DISABLE_CAT</code></td>
   </tr>
   <tr>
     <td><b><code>cd</code></b></td>
-    <td>!<code>CONFIG_DISABLE_ENVIRON</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
+    <td>!<code>CONFIG_DISABLE_ENVIRON</code></td>
     <td><code>CONFIG_NSH_DISABLE_CD</code></td>
   </tr>
   <tr>
     <td><b><code>cmp</code></b></td>
-    <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
+    <td>&nbsp;</td>
     <td><code>CONFIG_NSH_DISABLE_CMP</code></td>
   </tr>
   <tr>
     <td><b><code>cp</code></b></td>
-    <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
+    <td>&nbsp;</td>
     <td><code>CONFIG_NSH_DISABLE_CP</code></td>
   </tr>
   <tr>
@@ -3641,7 +3641,7 @@ nsh&gt;
   </tr>
   <tr>
     <td><b><code>dd</code></b></td>
-    <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
+    <td>&nbsp;</td>
     <td><code>CONFIG_NSH_DISABLE_DD</code></td>
   </tr>
   <tr>
@@ -3651,7 +3651,7 @@ nsh&gt;
   </tr>
   <tr>
     <td><b><code>df</code></b></td>
-    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_READABLE</code><sup>3</sup></td>
+    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_READABLE</code><sup>3</sup></td>
     <td><code>CONFIG_NSH_DISABLE_DF</code></td>
   </tr>
   <tr>
@@ -3666,7 +3666,7 @@ nsh&gt;
   </tr>
   <tr>
     <td><b><code>env</code></b></td>
-    <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_PROCFS</code> &amp;&amp; !<code>CONFIG_DISABLE_ENVIRON</code> &amp;&amp; !<code>CONFIG_PROCFS_EXCLUDE_ENVIRON</code>
+    <td><code>CONFIG_FS_PROCFS</code> &amp;&amp; !<code>CONFIG_DISABLE_ENVIRON</code> &amp;&amp; !<code>CONFIG_PROCFS_EXCLUDE_ENVIRON</code>
     <td><code>CONFIG_NSH_DISABLE_ENV</code></td>
   </tr>
   <tr>
@@ -3691,8 +3691,7 @@ nsh&gt;
   </tr>
   <tr>
     <td><b><code>get</code></b></td>
-    <td><code>CONFIG_NET</code> &amp;&amp; <code>CONFIG_NET_UDP</code> &amp;&amp;
-        <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <i>MTU</i> &gt;= 558<sup>1</sup></td>
+    <td><code>CONFIG_NET</code> &amp;&amp; <code>CONFIG_NET_UDP</code> &amp;&amp; <i>MTU</i> &gt;= 558<sup>1</sup></td>
     <td><code>CONFIG_NSH_DISABLE_GET</code></td>
   </tr>
   <tr>
@@ -3702,7 +3701,7 @@ nsh&gt;
   </tr>
   <tr>
     <td><b><code>hexdump</code></b></td>
-    <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
+    <td>&nbsp;</td>
     <td><code>CONFIG_NSH_DISABLE_HEXDUMP</code></td>
   </tr>
   <tr>
@@ -3737,17 +3736,17 @@ nsh&gt;
   </tr>
   <tr>
     <td><b><code>losetup</code></b></td>
-    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_DEV_LOOP</code></td>
+    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_DEV_LOOP</code></td>
     <td><code>CONFIG_NSH_DISABLE_LOSETUP</code></td>
   </tr>
   <tr>
     <td><b><code>ln</code></b></td>
-    <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_PSEUDOFS_SOFTLINKS</code></td>
+    <td><code>CONFIG_PSEUDOFS_SOFTLINKS</code></td>
     <td><code>CONFIG_NSH_DISABLE_LN</code></td>
   </tr>
   <tr>
     <td><b><code>ls</code></b></td>
-    <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
+    <td>&nbsp;</td>
     <td><code>CONFIG_NSH_DISABLE_LS</code></td>
   </tr>
   <tr>
@@ -3771,37 +3770,37 @@ nsh&gt;
   </tr>
   <tr>
     <td><b><code>mkdir</code></b></td>
-    <td>(((!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code>) &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0)<sup>4</sup></td>
+    <td>(((!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code>)</td>
     <td><code>CONFIG_NSH_DISABLE_MKDIR</code></td>
   </tr>
   <tr>
     <td><b><code>mkfatfs</code></b></td>
-    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FSUTILS_MKFATFS</code></td>
+    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FSUTILS_MKFATFS</code></td>
     <td><code>CONFIG_NSH_DISABLE_MKFATFS</code></td>
   </tr>
   <tr>
     <td><b><code>mkfifo</code></b></td>
-    <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_PIPES</code> &amp;&amp; <code>CONFIG_DEV_FIFO_SIZE</code> &gt; 0</td>
+    <td><code>CONFIG_PIPES</code> &amp;&amp; <code>CONFIG_DEV_FIFO_SIZE</code> &gt; 0</td>
     <td><code>CONFIG_NSH_DISABLE_MKFIFO</code></td>
   </tr>
   <tr>
     <td><b><code>mkrd</code></b></td>
-    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_WRITABLE</code><sup>4</sup></td>
+    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_WRITABLE</code><sup>4</sup></td>
     <td><code>CONFIG_NSH_DISABLE_MKRD</code></td>
   </tr>
   <tr>
     <td><b><code>mount</code></b></td>
-    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_READABLE</code><sup>3</sup></td>
+    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_READABLE</code><sup>3</sup></td>
     <td><code>CONFIG_NSH_DISABLE_MOUNT</code></td>
   </tr>
   <tr>
     <td><b><code>mv</code></b></td>
-    <td>(((!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code>) &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0)<sup>4</sup></td>
+    <td>(!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code><sup>4</sup></td>
     <td><code>CONFIG_NSH_DISABLE_MV</code></td>
   </tr>
   <tr>
     <td><b><code>nfsmount</code></b></td>
-    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_NET</code> &amp;&amp; <code>CONFIG_NFS</code></td>
+    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NET</code> &amp;&amp; <code>CONFIG_NFS</code></td>
     <td><code>CONFIG_NSH_DISABLE_NFSMOUNT</code></td>
   </tr>
   <tr>
@@ -3811,7 +3810,7 @@ nsh&gt;
   </tr>
   <tr>
     <td><b><code>passwd</code></b></td>
-    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_WRITABLE</code> &amp;&amp; <code>CONFIG_NSH_LOGIN_PASSWD</code></td>
+    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_WRITABLE</code> &amp;&amp; <code>CONFIG_NSH_LOGIN_PASSWD</code>sup>4</sup></td>
     <td><code>CONFIG_NSH_DISABLE_PASSWD</code></td>
   </tr>
   <tr>
@@ -3827,17 +3826,17 @@ nsh&gt;
   <tr>
     <td><b><code>put</code></b></td>
     <td><code>CONFIG_NET</code> &amp;&amp; <code>CONFIG_NET_UDP</code> &amp;&amp;
-    <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <i>MTU</i> &gt;= 558<sup>1,2</sup></td>
+    <code><i>MTU</i> &gt;= 558<sup>1,2</sup></td>
     <td><code>CONFIG_NSH_DISABLE_PUT</code></td>
   </tr>
   <tr>
     <td><b><code>pwd</code></b></td>
-    <td>!<code>CONFIG_DISABLE_ENVIRON</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
+    <td>!<code>CONFIG_DISABLE_ENVIRON</code></td>
     <td><code>CONFIG_NSH_DISABLE_PWD</code></td>
   </tr>
   <tr>
     <td><b><code>readlink</code></b></td>
-    <td><code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_PSEUDOFS_SOFTLINKS</code></td>
+    <td><code>CONFIG_PSEUDOFS_SOFTLINKS</code></td>
     <td><code>CONFIG_NSH_DISABLE_READLINK</code></td>
   </tr>
   <tr>
@@ -3847,12 +3846,12 @@ nsh&gt;
   </tr>
   <tr>
     <td><b><code>rm</code></b></td>
-    <td>(((!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code>) &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0)<sup>4</sup></td>
+    <td>(!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code><sup>4</sup></td>
     <td><code>CONFIG_NSH_DISABLE_RM</code></td>
   </tr>
   <tr>
     <td><b><code>rmdir</code></b></td>
-    <td>(((!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code>) &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0)<sup>4</sup></td>
+    <td>(!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_WRITABLE</code>) || !<code>CONFIG_DISABLE_PSEUDOFS_OPERATIONS</code><sup>4</sup></td>
     <td><code>CONFIG_NSH_DISABLE_RMDIR</code></td>
   </tr>
   <tr>
@@ -3872,7 +3871,7 @@ nsh&gt;
   </tr>
   <tr>
     <td><b><code>sh</code></b></td>
-    <td><code>CONFIG_NFILE_DESCRIPTORS &gt; 0 &amp;&amp; <code>CONFIG_NFILE_STREAMS &gt; 0 &amp;&amp; !<code>CONFIG_NSH_DISABLESCRIPT</code></td>
+    <td><code>CONFIG_NFILE_STREAMS &gt; 0 &amp;&amp; !<code>CONFIG_NSH_DISABLESCRIPT</code></td>
     <td><code>CONFIG_NSH_DISABLE_SH</code></td>
   </tr>
   <tr>
@@ -3902,12 +3901,12 @@ nsh&gt;
   </tr>
   <tr>
     <td><b><code>truncate</code></b></td>
-    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
+    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code></td>
     <td><code>CONFIG_NSH_DISABLE_TRUNCATE</code></td>
   </tr>
   <tr>
     <td><b><code>umount</code></b></td>
-    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_READABLE</code><sup>3</sup></td>
+    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_READABLE</code><sup>3</sup></td>
     <td><code>CONFIG_NSH_DISABLE_UMOUNT</code></td>
   </tr>
   <tr>
@@ -3932,12 +3931,12 @@ nsh&gt;
   </tr>
   <tr>
     <td><b><code>useradd</code></b></td>
-    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_WRITABLE</code> &amp;&amp; <code>CONFIG_NSH_LOGIN_PASSWD</code></td>
+    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_WRITABLE</code> &amp;&amp; <code>CONFIG_NSH_LOGIN_PASSWD</code>sup>4</sup></td>
     <td><code>CONFIG_NSH_DISABLE_USERADD</code></td>
   </tr>
   <tr>
     <td><b><code>userdel</code></b></td>
-    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0 &amp;&amp; <code>CONFIG_FS_WRITABLE</code> &amp;&amp; <code>CONFIG_NSH_LOGIN_PASSWD</code></td>
+    <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> &amp;&amp; <code>CONFIG_FS_WRITABLE</code> &amp;&amp; <code>CONFIG_NSH_LOGIN_PASSWD</code>sup>4</sup></td>
     <td><code>CONFIG_NSH_DISABLE_USERDEL</code></td>
   </tr>
   <tr>
@@ -3947,8 +3946,7 @@ nsh&gt;
   </tr>
   <tr>
     <td><b><code>wget</code></b></td>
-    <td><code>CONFIG_NET</code> &amp;&amp; <code>CONFIG_NET_TCP</code> &amp;&amp;
-        <code>CONFIG_NFILE_DESCRIPTORS</code> &gt; 0</td>
+    <td><code>CONFIG_NET</code> &amp;&amp; <code>CONFIG_NET_TCP</code></td>
     <td><code>CONFIG_NSH_DISABLE_WGET</code></td>
   </tr>
   <tr>

Documentation/NuttxPortingGuide.html

@@ -4926,9 +4926,7 @@ void iob_dump(FAR const char *msg, FAR struct iob_s *iob, unsigned int len,
 </p>
 
 <p><b>Pseudo Root File System</b>.
-  Or, a simple <i>in-memory</i>, <i>pseudo</i> file system can be enabled.
-  This simple file system can be enabled setting the CONFIG_NFILE_DESCRIPTORS
-  option to a non-zero value (see <a href="#apndxconfigs">Appendix A</a>).
+  A simple <i>in-memory</i>, <i>pseudo</i> file system can be enabled by default.
   This is an <i>in-memory</i> file system because it does not require any
   storage medium or block driver support.
   Rather, file system contents are generated on-the-fly as referenced via
@@ -4985,9 +4983,8 @@ void iob_dump(FAR const char *msg, FAR struct iob_s *iob, unsigned int len,
     <li>Other <i>Specialized</i> Drivers.</li>
   </ul>
   These different device driver types are discussed in the following paragraphs.
-  Note: device driver support requires that the <i>in-memory</i>, <i>pseudo</i> file system
-  is enabled by setting the CONFIG_NFILE_DESCRIPTORS in the NuttX configuration file to a
-  non-zero value.
+  Note: device driver support depends on the <i>in-memory</i>, <i>pseudo</i> file system
+  that is enabled by default.
 </p>
 
 <h2><a name="chardrivers">6.1 Character Device Drivers</a></h2>

Documentation/NuttxUserGuide.html

@@ -8465,9 +8465,7 @@ interface of the same name.
 </p>
 
 <p><b>Pseudo Root File System</b>.
-  Or, a simple <i>in-memory</i>, <i>pseudo</i> file system can be enabled.
-  This simple file system can be enabled setting the CONFIG_NFILE_DESCRIPTORS
-  option to a non-zero value.
+  A simple <i>in-memory</i>, <i>pseudo</i> file system can be enabled by default.
   This is an <i>in-memory</i> file system because it does not require any
   storage medium or block driver support.
   Rather, file system contents are generated on-the-fly as referenced via
@@ -8583,7 +8581,6 @@ interface of the same name.
   in your NuttX configuration file:
 </p>
 <ul>
-  <li><code>CONFIG_NFILE_DESCRIPTORS</code> Defined to be greater than 0</li>
   <li><code>CONFIG_DISABLE_POLL</code> NOT defined</li>
 </ul>
 <p>

arch/arm/src/common/up_exit.c

@@ -80,18 +80,15 @@
 #ifdef CONFIG_DUMP_ON_EXIT
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
-#if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct filelist *filelist;
 #if CONFIG_NFILE_STREAMS > 0
   FAR struct streamlist *streamlist;
 #endif
   int i;
-#endif
 
   sinfo("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
   sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
   for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
@@ -102,7 +99,6 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
                 i, inode->i_crefs);
         }
     }
-#endif
 
 #if CONFIG_NFILE_STREAMS > 0
   streamlist = tcb->group->tg_streamlist;

arch/arm/src/common/up_initialize.c

@@ -166,7 +166,6 @@ void up_initialize(void)
   iob_initialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   /* Register devices */
 
 #if defined(CONFIG_DEV_NULL)
@@ -188,7 +187,6 @@ void up_initialize(void)
 #if defined(CONFIG_DEV_LOOP)
   loop_register();      /* Standard /dev/loop */
 #endif
-#endif /* CONFIG_NFILE_DESCRIPTORS */
 
 #if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \
     defined(CONFIG_DRIVER_NOTE)
@@ -213,7 +211,7 @@ void up_initialize(void)
   ramlog_consoleinit();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_PSEUDOTERM_SUSV1)
+#ifdef CONFIG_PSEUDOTERM_SUSV1
   /* Register the master pseudo-terminal multiplexor device */
 
   (void)ptmx_register();
@@ -232,7 +230,7 @@ void up_initialize(void)
   up_cryptoinitialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_CRYPTO_CRYPTODEV)
+#ifdef CONFIG_CRYPTO_CRYPTODEV
   devcrypto_register();
 #endif
 

arch/arm/src/common/up_internal.h

@@ -57,7 +57,7 @@
  * assumed.
  */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS == 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE

arch/avr/src/at32uc3/at32uc3_config.h

@@ -149,7 +149,7 @@
  * assumed.
  */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE

arch/avr/src/at90usb/at90usb_config.h

@@ -68,7 +68,7 @@
  * assumed.
  */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE

arch/avr/src/atmega/atmega_config.h

@@ -74,7 +74,7 @@
  * assumed.
  */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE

arch/avr/src/common/up_exit.c

@@ -79,18 +79,15 @@
 #ifdef CONFIG_DUMP_ON_EXIT
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
-#if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct filelist *filelist;
 #if CONFIG_NFILE_STREAMS > 0
   FAR struct streamlist *streamlist;
 #endif
   int i;
-#endif
 
   sinfo("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
   sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
   for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
@@ -101,7 +98,6 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
                 i, inode->i_crefs);
         }
     }
-#endif
 
 #if CONFIG_NFILE_STREAMS > 0
   streamlist = tcb->group->tg_streamlist;

arch/avr/src/common/up_initialize.c

@@ -74,7 +74,7 @@
  * assumed.
  */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE
@@ -207,7 +207,6 @@ void up_initialize(void)
   iob_initialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   /* Register devices */
 
 #if defined(CONFIG_DEV_NULL)
@@ -229,7 +228,6 @@ void up_initialize(void)
 #if defined(CONFIG_DEV_LOOP)
   loop_register();      /* Standard /dev/loop */
 #endif
-#endif /* CONFIG_NFILE_DESCRIPTORS */
 
 #if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \
     defined(CONFIG_DRIVER_NOTE)
@@ -254,7 +252,7 @@ void up_initialize(void)
   ramlog_consoleinit();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_PSEUDOTERM_SUSV1)
+#ifdef CONFIG_PSEUDOTERM_SUSV1
   /* Register the master pseudo-terminal multiplexor device */
 
   (void)ptmx_register();
@@ -273,7 +271,7 @@ void up_initialize(void)
   up_cryptoinitialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_CRYPTO_CRYPTODEV)
+#ifdef CONFIG_CRYPTO_CRYPTODEV
   devcrypto_register();
 #endif
 

arch/avr/src/common/up_internal.h

@@ -151,13 +151,8 @@ void up_lowinit(void);
 
 /* Defined in chip/xxx_serial.c */
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
 void up_earlyserialinit(void);
 void up_serialinit(void);
-#else
-# define up_earlyserialinit()
-# define up_serialinit()
-#endif
 
 /* Defined in drivers/lowconsole.c */
 

arch/hc/src/common/up_exit.c

@@ -79,18 +79,15 @@
 #ifdef CONFIG_DUMP_ON_EXIT
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
-#if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct filelist *filelist;
 #if CONFIG_NFILE_STREAMS > 0
   FAR struct streamlist *streamlist;
 #endif
   int i;
-#endif
 
   sinfo("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
   sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
   for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
@@ -101,7 +98,6 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
                 i, inode->i_crefs);
         }
     }
-#endif
 
 #if CONFIG_NFILE_STREAMS > 0
   streamlist = tcb->group->tg_streamlist;

arch/hc/src/common/up_initialize.c

@@ -129,7 +129,6 @@ void up_initialize(void)
   iob_initialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   /* Register devices */
 
 #if defined(CONFIG_DEV_NULL)
@@ -151,7 +150,6 @@ void up_initialize(void)
 #if defined(CONFIG_DEV_LOOP)
   loop_register();      /* Standard /dev/loop */
 #endif
-#endif /* CONFIG_NFILE_DESCRIPTORS */
 
 #if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \
     defined(CONFIG_DRIVER_NOTE)
@@ -176,7 +174,7 @@ void up_initialize(void)
   ramlog_consoleinit();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_PSEUDOTERM_SUSV1)
+#ifdef CONFIG_PSEUDOTERM_SUSV1
   /* Register the master pseudo-terminal multiplexor device */
 
   (void)ptmx_register();
@@ -195,7 +193,7 @@ void up_initialize(void)
   up_cryptoinitialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_CRYPTO_CRYPTODEV)
+#ifdef CONFIG_CRYPTO_CRYPTODEV
   devcrypto_register();
 #endif
 

arch/hc/src/common/up_internal.h

@@ -57,7 +57,7 @@
  * assumed.
  */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE
@@ -163,13 +163,8 @@ void hc_timer_initialize(void);
 
 /* Debug output */
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
 void up_earlyserialinit(void);
 void up_serialinit(void);
-#else
-# define up_earlyserialinit()
-# define up_serialinit()
-#endif
 
 #ifdef CONFIG_DEV_LOWCONSOLE
 void lowconsole_init(void);

arch/mips/src/common/up_exit.c

@@ -81,18 +81,15 @@
 #ifdef CONFIG_DUMP_ON_EXIT
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
-#if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct filelist *filelist;
 #if CONFIG_NFILE_STREAMS > 0
   FAR struct streamlist *streamlist;
 #endif
   int i;
-#endif
 
   sinfo("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
   sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
   for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
@@ -103,7 +100,6 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
                 i, inode->i_crefs);
         }
     }
-#endif
 
 #if CONFIG_NFILE_STREAMS > 0
   streamlist = tcb->group->tg_streamlist;

arch/mips/src/common/up_initialize.c

@@ -131,7 +131,6 @@ void up_initialize(void)
   iob_initialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   /* Register devices */
 
 #if defined(CONFIG_DEV_NULL)
@@ -153,7 +152,6 @@ void up_initialize(void)
 #if defined(CONFIG_DEV_LOOP)
   loop_register();      /* Standard /dev/loop */
 #endif
-#endif /* CONFIG_NFILE_DESCRIPTORS */
 
 #if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \
     defined(CONFIG_DRIVER_NOTE)
@@ -178,7 +176,7 @@ void up_initialize(void)
   ramlog_consoleinit();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_PSEUDOTERM_SUSV1)
+#ifdef CONFIG_PSEUDOTERM_SUSV1
   /* Register the master pseudo-terminal multiplexor device */
 
   (void)ptmx_register();
@@ -197,7 +195,7 @@ void up_initialize(void)
   up_cryptoinitialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_CRYPTO_CRYPTODEV)
+#ifdef CONFIG_CRYPTO_CRYPTODEV
   devcrypto_register();
 #endif
 

arch/mips/src/common/up_internal.h

@@ -54,7 +54,7 @@
  * assumed.
  */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE
@@ -236,13 +236,8 @@ void up_addregion(void);
 /* Serial output */
 
 void up_lowputc(char ch);
-#if CONFIG_NFILE_DESCRIPTORS > 0
 void up_earlyserialinit(void);
 void up_serialinit(void);
-#else
-# define up_earlyserialinit()
-# define up_serialinit()
-#endif
 
 /* System timer */
 

arch/misoc/src/lm32/lm32.h

@@ -74,7 +74,7 @@
  * assumed.
  */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE

arch/misoc/src/lm32/lm32_exit.c

@@ -74,18 +74,15 @@
 #ifdef CONFIG_DUMP_ON_EXIT
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
-#if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct filelist *filelist;
 #if CONFIG_NFILE_STREAMS > 0
   FAR struct streamlist *streamlist;
 #endif
   int i;
-#endif
 
   sinfo("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
   sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
   for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
@@ -96,7 +93,6 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
                 i, inode->i_crefssinfo);
         }
     }
-#endif
 
 #if CONFIG_NFILE_STREAMS > 0
   streamlist = tcb->group->tg_streamlist;

arch/misoc/src/minerva/minerva.h

@@ -74,7 +74,7 @@
  * assumed.
  */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE

arch/misoc/src/minerva/minerva_exit.c

@@ -74,18 +74,15 @@
 #ifdef CONFIG_DUMP_ON_EXIT
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
-#if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct filelist *filelist;
 #if CONFIG_NFILE_STREAMS > 0
   FAR struct streamlist *streamlist;
 #endif
   int i;
-#endif
 
   sinfo("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
   sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
   for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
@@ -95,7 +92,6 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
           sinfo("      fd=%d refcount=%d\n", i, inode->i_crefssinfo);
         }
     }
-#endif
 
 #if CONFIG_NFILE_STREAMS > 0
   streamlist = tcb->group->tg_streamlist;

arch/or1k/src/common/up_exit.c

@@ -79,18 +79,15 @@
 #ifdef CONFIG_DUMP_ON_EXIT
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
-#if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct filelist *filelist;
 #if CONFIG_NFILE_STREAMS > 0
   FAR struct streamlist *streamlist;
 #endif
   int i;
-#endif
 
   sinfo("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
   sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
   for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
@@ -101,7 +98,6 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
                 i, inode->i_crefssinfo);
         }
     }
-#endif
 
 #if CONFIG_NFILE_STREAMS > 0
   streamlist = tcb->group->tg_streamlist;

arch/or1k/src/common/up_initialize.c

@@ -225,7 +225,6 @@ void up_initialize(void)
   iob_initialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   /* Register devices */
 
 #if defined(CONFIG_DEV_NULL)
@@ -247,7 +246,6 @@ void up_initialize(void)
 #if defined(CONFIG_DEV_LOOP)
   loop_register();      /* Standard /dev/loop */
 #endif
-#endif /* CONFIG_NFILE_DESCRIPTORS */
 
 #if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \
     defined(CONFIG_DRIVER_NOTE)
@@ -270,7 +268,7 @@ void up_initialize(void)
   ramlog_consoleinit();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_PSEUDOTERM_SUSV1)
+#ifdef CONFIG_PSEUDOTERM_SUSV1
   /* Register the master pseudo-terminal multiplexor device */
 
   (void)ptmx_register();
@@ -293,7 +291,7 @@ void up_initialize(void)
   up_cryptoinitialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_CRYPTO_CRYPTODEV)
+#ifdef CONFIG_CRYPTO_CRYPTODEV
   devcrypto_register();
 #endif
 

arch/or1k/src/common/up_internal.h

@@ -57,7 +57,7 @@
  * assumed.
  */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS == 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE

arch/renesas/src/common/up_exit.c

@@ -79,18 +79,15 @@
 #ifdef CONFIG_DUMP_ON_EXIT
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
-#if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct filelist *filelist;
 #if CONFIG_NFILE_STREAMS > 0
   FAR struct streamlist *streamlist;
 #endif
   int i;
-#endif
 
   sinfo("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
   sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
   for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
@@ -101,7 +98,6 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
                 i, inode->i_crefs);
         }
     }
-#endif
 
 #if CONFIG_NFILE_STREAMS > 0
   streamlist = tcb->group->tg_streamlist;

arch/renesas/src/common/up_initialize.c

@@ -112,7 +112,6 @@ void up_initialize(void)
   iob_initialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   /* Register devices */
 
 #if defined(CONFIG_DEV_NULL)
@@ -134,7 +133,6 @@ void up_initialize(void)
 #if defined(CONFIG_DEV_LOOP)
   loop_register();      /* Standard /dev/loop */
 #endif
-#endif /* CONFIG_NFILE_DESCRIPTORS */
 
 #if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \
     defined(CONFIG_DRIVER_NOTE)
@@ -162,7 +160,7 @@ void up_initialize(void)
   ramlog_consoleinit();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_PSEUDOTERM_SUSV1)
+#ifdef CONFIG_PSEUDOTERM_SUSV1
   /* Register the master pseudo-terminal multiplexor device */
 
   (void)ptmx_register();
@@ -181,7 +179,7 @@ void up_initialize(void)
   up_cryptoinitialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_CRYPTO_CRYPTODEV)
+#ifdef CONFIG_CRYPTO_CRYPTODEV
   devcrypto_register();
 #endif
 

arch/renesas/src/common/up_internal.h

@@ -62,7 +62,7 @@
  * a serial console is assumed.
  */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE
@@ -165,13 +165,8 @@ void up_vectorfiq(void);
 
 /* Defined in xyz_serial.c */
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
 void up_earlyconsoleinit(void);
 void up_consoleinit(void);
-#else
-# define up_earlyconsoleinit()
-# define up_consoleinit()
-#endif
 
 /* Defined in drivers/lowconsole.c */
 

arch/risc-v/src/common/up_exit.c

@@ -81,18 +81,15 @@
 #ifdef CONFIG_DUMP_ON_EXIT
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
-#if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct filelist *filelist;
 #if CONFIG_NFILE_STREAMS > 0
   FAR struct streamlist *streamlist;
 #endif
   int i;
-#endif
 
   sinfo("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
   sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
   for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
@@ -103,7 +100,6 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
                 i, inode->i_crefs);
         }
     }
-#endif
 
 #if CONFIG_NFILE_STREAMS > 0
   streamlist = tcb->group->tg_streamlist;

arch/risc-v/src/common/up_initialize.c

@@ -131,7 +131,6 @@ void up_initialize(void)
   iob_initialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   /* Register devices */
 
 #if defined(CONFIG_DEV_NULL)
@@ -142,8 +141,6 @@ void up_initialize(void)
   devzero_register();   /* Standard /dev/zero */
 #endif
 
-#endif /* CONFIG_NFILE_DESCRIPTORS */
-
   /* Initialize the serial device driver */
 
 #ifdef USE_SERIALDRIVER
@@ -162,7 +159,7 @@ void up_initialize(void)
   ramlog_consoleinit();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_PSEUDOTERM_SUSV1)
+#ifdef CONFIG_PSEUDOTERM_SUSV1
   /* Register the master pseudo-terminal multiplexor device */
 
   (void)ptmx_register();

arch/risc-v/src/common/up_internal.h

@@ -77,7 +77,7 @@
  * assumed.
  */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE

arch/sim/src/up_initialize.c

@@ -207,7 +207,6 @@ void up_initialize(void)
   iob_initialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   /* Register devices */
 
 #if defined(CONFIG_DEV_NULL)
@@ -229,7 +228,6 @@ void up_initialize(void)
 #if defined(CONFIG_DEV_LOOP)
   loop_register();          /* Standard /dev/loop */
 #endif
-#endif /* CONFIG_NFILE_DESCRIPTORS */
 
 #if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \
     defined(CONFIG_DRIVER_NOTE)
@@ -250,7 +248,7 @@ void up_initialize(void)
   ramlog_consoleinit();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_PSEUDOTERM_SUSV1)
+#ifdef CONFIG_PSEUDOTERM_SUSV1
   /* Register the master pseudo-terminal multiplexor device */
 
   (void)ptmx_register();
@@ -269,7 +267,7 @@ void up_initialize(void)
   up_cryptoinitialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_CRYPTO_CRYPTODEV)
+#ifdef CONFIG_CRYPTO_CRYPTODEV
   devcrypto_register();
 #endif
 

arch/sim/src/up_internal.h

@@ -85,7 +85,7 @@
 
 /* Determine which (if any) console driver to use */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS == 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef USE_DEVCONSOLE
 #  undef CONFIG_RAMLOG_CONSOLE
 #else

arch/x86/src/common/up_exit.c

@@ -79,18 +79,15 @@
 #ifdef CONFIG_DUMP_ON_EXIT
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
-#if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct filelist *filelist;
 #if CONFIG_NFILE_STREAMS > 0
   FAR struct streamlist *streamlist;
 #endif
   int i;
-#endif
 
   sinfo("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
   sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
   for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
@@ -101,7 +98,6 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
                 i, inode->i_crefs);
         }
     }
-#endif
 
 #if CONFIG_NFILE_STREAMS > 0
   streamlist = tcb->group->tg_streamlist;

arch/x86/src/common/up_initialize.c

@@ -131,7 +131,6 @@ void up_initialize(void)
   iob_initialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   /* Register devices */
 
 #if defined(CONFIG_DEV_NULL)
@@ -153,7 +152,6 @@ void up_initialize(void)
 #if defined(CONFIG_DEV_LOOP)
   loop_register();      /* Standard /dev/loop */
 #endif
-#endif /* CONFIG_NFILE_DESCRIPTORS */
 
 #if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \
     defined(CONFIG_DRIVER_NOTE)
@@ -178,7 +176,7 @@ void up_initialize(void)
   ramlog_consoleinit();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_PSEUDOTERM_SUSV1)
+#ifdef CONFIG_PSEUDOTERM_SUSV1
   /* Register the master pseudo-terminal multiplexor device */
 
   (void)ptmx_register();
@@ -197,7 +195,7 @@ void up_initialize(void)
   up_cryptoinitialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_CRYPTO_CRYPTODEV)
+#ifdef CONFIG_CRYPTO_CRYPTODEV
   devcrypto_register();
 #endif
 

arch/x86/src/common/up_internal.h

@@ -56,7 +56,7 @@
  * assumed.
  */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE
@@ -202,13 +202,8 @@ void up_addregion(void);
 
 /* Defined in xyz_serial.c */
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
 void up_earlyserialinit(void);
 void up_serialinit(void);
-#else
-# define up_earlyserialinit()
-# define up_serialinit()
-#endif
 
 /* Defined in drivers/lowconsole.c */
 

arch/xtensa/src/common/xtensa.h

@@ -57,7 +57,7 @@
  * assumed.
  */
 
-#if !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
+#ifndef CONFIG_DEV_CONSOLE
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE
@@ -329,13 +329,8 @@ void xtensa_add_region(void);
 /* Serial output */
 
 void up_lowputc(char ch);
-#if CONFIG_NFILE_DESCRIPTORS > 0
 void xtensa_early_serial_initialize(void);
 void xtensa_serial_initialize(void);
-#else
-# define xtensa_earlyserialinit()
-# define xtensa_serial_initialize()
-#endif
 
 /* System timer */
 

arch/xtensa/src/common/xtensa_exit.c

@@ -80,18 +80,15 @@
 #ifdef CONFIG_DUMP_ON_EXIT
 static void _xtensa_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
-#if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct filelist *filelist;
 #if CONFIG_NFILE_STREAMS > 0
   FAR struct streamlist *streamlist;
 #endif
   int i;
-#endif
 
   sinfo("  TCB=%p name=%s pid=%d\n", tcb, tcb->argv[0], tcb->pid);
   sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
   for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
@@ -102,7 +99,6 @@ static void _xtensa_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
                 i, inode->i_crefs);
         }
     }
-#endif
 
 #if CONFIG_NFILE_STREAMS > 0
   streamlist = tcb->group->tg_streamlist;

arch/xtensa/src/common/xtensa_initialize.c

@@ -139,7 +139,6 @@ void up_initialize(void)
   iob_initialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   /* Register devices */
 
 #if defined(CONFIG_DEV_NULL)
@@ -161,7 +160,6 @@ void up_initialize(void)
 #if defined(CONFIG_DEV_LOOP)
   loop_register();      /* Standard /dev/loop */
 #endif
-#endif /* CONFIG_NFILE_DESCRIPTORS */
 
 #if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \
     defined(CONFIG_DRIVER_NOTE)
@@ -186,7 +184,7 @@ void up_initialize(void)
   ramlog_consoleinit();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_PSEUDOTERM_SUSV1)
+#ifdef CONFIG_PSEUDOTERM_SUSV1
   /* Register the master pseudo-terminal multiplexor device */
 
   (void)ptmx_register();
@@ -205,7 +203,7 @@ void up_initialize(void)
   up_cryptoinitialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_CRYPTO_CRYPTODEV)
+#ifdef CONFIG_CRYPTO_CRYPTODEV
   devcrypto_register();
 #endif
 

arch/z16/src/common/up_exit.c

@@ -79,18 +79,15 @@
 #ifdef CONFIG_DUMP_ON_EXIT
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
-#if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct filelist *filelist;
 #if CONFIG_NFILE_STREAMS > 0
   FAR struct streamlist *streamlist;
 #endif
   int i;
-#endif
 
   sinfo("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
   sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
   for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
@@ -101,7 +98,6 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
                 i, inode->i_crefs);
         }
     }
-#endif
 
 #if CONFIG_NFILE_STREAMS > 0
   streamlist = tcb->group->tg_streamlist;

arch/z16/src/common/up_initialize.c

@@ -131,7 +131,6 @@ void up_initialize(void)
   iob_initialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   /* Register devices */
 
 #if defined(CONFIG_DEV_NULL)
@@ -153,7 +152,6 @@ void up_initialize(void)
 #if defined(CONFIG_DEV_LOOP)
   loop_register();      /* Standard /dev/loop */
 #endif
-#endif /* CONFIG_NFILE_DESCRIPTORS */
 
 #if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \
     defined(CONFIG_DRIVER_NOTE)
@@ -178,7 +176,7 @@ void up_initialize(void)
   ramlog_consoleinit();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_PSEUDOTERM_SUSV1)
+#ifdef CONFIG_PSEUDOTERM_SUSV1
   /* Register the master pseudo-terminal multiplexor device */
 
   (void)ptmx_register();
@@ -197,7 +195,7 @@ void up_initialize(void)
   up_cryptoinitialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_CRYPTO_CRYPTODEV)
+#ifdef CONFIG_CRYPTO_CRYPTODEV
   devcrypto_register();
 #endif
 

arch/z16/src/common/up_internal.h

@@ -62,10 +62,10 @@
  */
 
 #if defined(CONFIG_Z16_LOWPUTC) || defined(CONFIG_Z16_LOWGETC) || \
-    CONFIG_NFILE_DESCRIPTORS == 0 || defined(CONFIG_DEV_LOWCONSOLE)
+    defined(CONFIG_DEV_LOWCONSOLE)
 #  define USE_LOWCONSOLE 1
 #  define USE_LOWUARTINIT 1
-#elif !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
+#elif !defined(CONFIG_DEV_CONSOLE)
 #  undef  USE_SERIALDRIVER
 #  undef  USE_EARLYSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE

arch/z80/src/common/up_exit.c

@@ -81,18 +81,15 @@
 #ifdef CONFIG_DUMP_ON_EXIT
 static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
 {
-#if CONFIG_NFILE_DESCRIPTORS > 0
   FAR struct filelist *filelist;
 #if CONFIG_NFILE_STREAMS > 0
   FAR struct streamlist *streamlist;
 #endif
   int i;
-#endif
 
   sinfo("  TCB=%p name=%s\n", tcb, tcb->argv[0]);
   sinfo("    priority=%d state=%d\n", tcb->sched_priority, tcb->task_state);
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   filelist = tcb->group->tg_filelist;
   for (i = 0; i < CONFIG_NFILE_DESCRIPTORS; i++)
     {
@@ -103,7 +100,6 @@ static void _up_dumponexit(FAR struct tcb_s *tcb, FAR void *arg)
                 i, inode->i_crefs);
         }
     }
-#endif
 
 #if CONFIG_NFILE_STREAMS > 0
   streamlist = tcb->group->tg_streamlist;

arch/z80/src/common/up_initialize.c

@@ -128,7 +128,6 @@ void up_initialize(void)
   iob_initialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0
   /* Register devices */
 
 #if defined(CONFIG_DEV_NULL)
@@ -150,7 +149,6 @@ void up_initialize(void)
 #if defined(CONFIG_DEV_LOOP)
   loop_register();      /* Standard /dev/loop */
 #endif
-#endif /* CONFIG_NFILE_DESCRIPTORS */
 
 #if defined(CONFIG_SCHED_INSTRUMENTATION_BUFFER) && \
     defined(CONFIG_DRIVER_NOTE)
@@ -175,7 +173,7 @@ void up_initialize(void)
   ramlog_consoleinit();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_PSEUDOTERM_SUSV1)
+#ifdef CONFIG_PSEUDOTERM_SUSV1
   /* Register the master pseudo-terminal multiplexor device */
 
   (void)ptmx_register();
@@ -194,7 +192,7 @@ void up_initialize(void)
   up_cryptoinitialize();
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_CRYPTO_CRYPTODEV)
+#ifdef CONFIG_CRYPTO_CRYPTODEV
   devcrypto_register();
 #endif
 

arch/z80/src/common/up_internal.h

@@ -57,14 +57,14 @@
  * assumed.
  */
 
-#if CONFIG_NFILE_DESCRIPTORS == 0 || defined(CONFIG_DEV_LOWCONSOLE)
+#if defined(CONFIG_DEV_LOWCONSOLE)
 #  undef USE_SERIALDRIVER
 #  ifdef CONFIG_HAVE_LOWSERIALINIT
 #    define USE_LOWSERIALINIT 1
 #  else
 #    undef USE_LOWSERIALINIT
 #  endif
-#elif !defined(CONFIG_DEV_CONSOLE) || CONFIG_NFILE_DESCRIPTORS <= 0
+#elif !defined(CONFIG_DEV_CONSOLE)
 #  undef  USE_SERIALDRIVER
 #  undef  USE_LOWSERIALINIT
 #  undef  CONFIG_DEV_LOWCONSOLE

binfmt/libpcode/README.txt

@@ -12,7 +12,6 @@ the NuttX apps/ package and that you have named the directory apps/).
 
 Other required configuration settings:
 
-  CONFIG_NFILE_DESCRIPTORS > 3
   CONFIG_BINFMT_DISABLE=n
   CONFIG_BINFMT_PCODE=y
 

binfmt/pcode.c

@@ -67,10 +67,6 @@
  * are required -- only the more obvious.
  */
 
-#if CONFIG_NFILE_DESCRIPTORS < 1
-#  error You must provide file descriptors via CONFIG_NFILE_DESCRIPTORS in your configuration file
-#endif
-
 #ifdef CONFIG_BINFMT_DISABLE
 #  error The binary loader is disabled (CONFIG_BINFMT_DISABLE)!
 #endif

configs/demo9s12ne64/ostest/defconfig

@@ -20,7 +20,7 @@ CONFIG_IDLETHREAD_STACKSIZE=256
 CONFIG_MAX_TASKS=8
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=0
+CONFIG_NFILE_DESCRIPTORS=3
 CONFIG_NFILE_STREAMS=0
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0

configs/ea3131/locked/mklocked.sh

@@ -183,10 +183,7 @@ if [ "$answer" = n ]; then
 	echo "EXTERN(pthread_initialize)" >>ld-locked.inc
 fi
 
-answer=$(checkzero CONFIG_NFILE_DESCRIPTORS)
-if [ "$answer" = n ]; then
-	echo "EXTERN(fs_initialize)" >>ld-locked.inc
-fi
+echo "EXTERN(fs_initialize)" >>ld-locked.inc
 
 answer=$(checkconfig CONFIG_NET)
 if [ "$answer" = y ]; then