You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/03/17 13:46:51 UTC

[incubator-nuttx] 02/03: fs: delete NFILE_DESCRIPTORS for allocating dynamically

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 59eb4fa8d692e0383a71a8ef46404182dc496a83
Author: Jiuzhu Dong <do...@xiaomi.com>
AuthorDate: Mon Mar 8 14:25:03 2021 +0800

    fs: delete NFILE_DESCRIPTORS for allocating dynamically
    
    Change-Id: Id06d215063796d222b9792d25ab2d6742167729f
    Signed-off-by: Jiuzhu Dong <do...@xiaomi.com>
---
 Documentation/applications/nsh/installation.rst                |  3 ---
 Documentation/applications/nsh/nsh.rst                         |  1 -
 boards/arm/a1x/pcduino-a10/configs/nsh/defconfig               |  1 -
 boards/arm/am335x/beaglebone-black/configs/lcd/defconfig       |  1 -
 boards/arm/am335x/beaglebone-black/configs/nsh/defconfig       |  1 -
 boards/arm/c5471/c5471evm/configs/httpd/defconfig              |  1 -
 boards/arm/c5471/c5471evm/configs/nettest/defconfig            |  1 -
 boards/arm/c5471/c5471evm/configs/nsh/defconfig                |  1 -
 boards/arm/cxd56xx/spresense/configs/audio/defconfig           |  1 -
 boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig       |  1 -
 boards/arm/cxd56xx/spresense/configs/camera/defconfig          |  1 -
 boards/arm/cxd56xx/spresense/configs/elf/defconfig             |  1 -
 boards/arm/cxd56xx/spresense/configs/example_camera/defconfig  |  1 -
 boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig     |  1 -
 boards/arm/cxd56xx/spresense/configs/lcd/defconfig             |  1 -
 boards/arm/cxd56xx/spresense/configs/lte/defconfig             |  1 -
 boards/arm/cxd56xx/spresense/configs/module/defconfig          |  1 -
 boards/arm/cxd56xx/spresense/configs/mpy/defconfig             |  1 -
 boards/arm/cxd56xx/spresense/configs/nsh/defconfig             |  1 -
 boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig     |  1 -
 boards/arm/cxd56xx/spresense/configs/rndis/defconfig           |  1 -
 boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig       |  1 -
 boards/arm/cxd56xx/spresense/configs/smp/defconfig             |  1 -
 boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig          |  1 -
 boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig          |  1 -
 boards/arm/cxd56xx/spresense/configs/wifi/defconfig            |  1 -
 boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig        |  1 -
 boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig         |  1 -
 boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig             |  1 -
 boards/arm/dm320/ntosd-dm320/configs/poll/defconfig            |  1 -
 boards/arm/dm320/ntosd-dm320/configs/udp/defconfig             |  1 -
 boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig       |  1 -
 boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig          |  1 -
 boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig         |  1 -
 .../arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig   |  1 -
 boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig           |  1 -
 boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig       |  1 -
 boards/arm/imx6/sabre-6quad/configs/nsh/defconfig              |  1 -
 boards/arm/imx6/sabre-6quad/configs/smp/defconfig              |  1 -
 boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig        |  1 -
 boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig           |  1 -
 boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig         |  1 -
 boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig          |  1 -
 boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig    |  1 -
 boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig        |  1 -
 boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig           |  1 -
 boards/arm/imxrt/imxrt1060-evk/configs/can/defconfig           |  1 -
 boards/arm/imxrt/imxrt1060-evk/configs/canfd/defconfig         |  1 -
 boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig          |  1 -
 boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig    |  1 -
 boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig          |  1 -
 boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig        |  1 -
 boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig           |  1 -
 boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig      |  1 -
 boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig          |  1 -
 boards/arm/imxrt/teensy-4.x/configs/lcd-4.1/defconfig          |  1 -
 boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig       |  1 -
 boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig          |  1 -
 boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig          |  1 -
 boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig        |  1 -
 boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig           |  1 -
 boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig          |  1 -
 boards/arm/kinetis/freedom-k28f/configs/nshsdusb/defconfig     |  1 -
 boards/arm/kinetis/freedom-k64f/configs/cdcacm/defconfig       |  1 -
 boards/arm/kinetis/freedom-k64f/configs/demo/defconfig         |  1 -
 boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig       |  1 -
 boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig          |  1 -
 boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig       |  1 -
 boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig          |  1 -
 boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig       |  1 -
 boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig            |  1 -
 boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig         |  1 -
 boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig           |  1 -
 boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig       |  1 -
 boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig          |  1 -
 boards/arm/kl/freedom-kl25z/configs/nsh/defconfig              |  2 +-
 boards/arm/kl/freedom-kl26z/configs/nsh/defconfig              |  2 +-
 boards/arm/kl/teensy-lc/configs/nsh/defconfig                  |  2 +-
 boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig     |  1 -
 boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig        |  1 -
 boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig       |  1 -
 boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig      |  1 -
 boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig      |  1 -
 boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig   |  1 -
 boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig    |  1 -
 boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig       |  1 -
 .../arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig  |  1 -
 boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig     |  1 -
 boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig       |  1 -
 boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig     |  1 -
 boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig        |  1 -
 .../arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig  |  1 -
 boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig  |  1 -
 boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig   |  1 -
 .../arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig |  1 -
 .../arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig  |  1 -
 .../lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig    |  1 -
 .../arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig  |  1 -
 .../arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig   |  1 -
 .../lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig   |  1 -
 .../lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig   |  1 -
 boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig           |  1 -
 boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig             |  1 -
 boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig          |  1 -
 .../arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig  |  1 -
 .../lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig    |  1 -
 .../lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig  |  1 -
 .../lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig   |  1 -
 .../arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig   |  1 -
 .../olimex-lpc1766stk/configs/slip-httpd/defconfig             |  1 -
 .../olimex-lpc1766stk/configs/thttpd-binfs/defconfig           |  1 -
 .../olimex-lpc1766stk/configs/thttpd-nxflat/defconfig          |  1 -
 .../lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig    |  1 -
 .../lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig |  1 -
 .../lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig    |  1 -
 boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig          |  1 -
 boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig        |  1 -
 boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig     |  1 -
 boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig         |  1 -
 boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig     |  1 -
 boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig    |  1 -
 boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig        |  1 -
 boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig      |  1 -
 boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig  |  1 -
 boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig    |  1 -
 .../arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig   |  1 -
 boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig |  1 -
 boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig  |  1 -
 boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig        |  1 -
 boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig     |  1 -
 boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig  |  1 -
 boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig              |  1 -
 boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig          |  1 -
 boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig        |  1 -
 boards/arm/lpc31xx/ea3131/configs/nsh/defconfig                |  1 -
 boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig              |  1 -
 boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig          |  1 -
 boards/arm/lpc31xx/ea3152/configs/ostest/defconfig             |  1 -
 boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig      |  1 -
 boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig         |  1 -
 boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig     |  1 -
 boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig       |  1 -
 boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig          |  1 -
 boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig       |  1 -
 boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig       |  1 -
 boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig            |  1 -
 boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig           |  1 -
 boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig         |  1 -
 boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig    |  1 -
 boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig  |  1 -
 .../arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig   |  1 -
 boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig   |  1 -
 boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig  |  1 -
 boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig  |  1 -
 .../arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig  |  1 -
 .../arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig  |  1 -
 .../arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig  |  1 -
 boards/arm/max326xx/max32660-evsys/configs/nsh/defconfig       |  1 -
 boards/arm/moxart/moxa/configs/nsh/defconfig                   |  1 -
 boards/arm/nrf52/nrf52-feather/configs/i2c/defconfig           |  1 -
 boards/arm/nrf52/nrf52-feather/configs/nsh/defconfig           |  1 -
 boards/arm/nrf52/nrf52-feather/configs/userleds/defconfig      |  1 -
 boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig             |  1 -
 boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig            |  1 -
 boards/arm/nrf52/nrf52832-mdk/configs/nsh/defconfig            |  1 -
 boards/arm/nrf52/nrf52832-mdk/configs/sdc/defconfig            |  1 -
 boards/arm/nrf52/nrf52832-sparkfun/configs/nsh/defconfig       |  1 -
 boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig             |  1 -
 boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig         |  1 -
 boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig             |  1 -
 boards/arm/nrf52/nrf52840-dk/configs/pwm/defconfig             |  1 -
 boards/arm/nrf52/nrf52840-dk/configs/sx127x/defconfig          |  1 -
 boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig           |  1 -
 boards/arm/nrf52/nrf52840-dongle/configs/nsh/defconfig         |  1 -
 boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig          |  2 +-
 .../arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig  |  2 +-
 boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig  |  2 +-
 boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig       |  2 +-
 boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig   |  2 +-
 boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig       |  2 +-
 boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig     |  2 +-
 boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig   |  2 +-
 boards/arm/s32k1xx/rddrone-uavcan144/configs/nsh/defconfig     |  1 -
 .../arm/s32k1xx/rddrone-uavcan144/configs/nshdebug/defconfig   |  1 -
 boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig     |  1 -
 .../arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig   |  1 -
 boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig            |  2 +-
 boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig            |  1 -
 boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig            |  1 -
 boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig            |  1 -
 boards/arm/sam34/arduino-due/configs/nsh/defconfig             |  1 -
 boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig        |  1 -
 boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig    |  1 -
 boards/arm/sam34/sam3u-ek/configs/knsh/defconfig               |  1 -
 boards/arm/sam34/sam3u-ek/configs/nsh/defconfig                |  1 -
 boards/arm/sam34/sam3u-ek/configs/nx/defconfig                 |  1 -
 boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig               |  1 -
 boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig              |  1 -
 boards/arm/sam34/sam4e-ek/configs/nsh/defconfig                |  1 -
 boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig               |  1 -
 boards/arm/sam34/sam4e-ek/configs/usbnsh/defconfig             |  1 -
 boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig          |  1 -
 boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig          |  1 -
 boards/arm/sama5/giant-board/configs/netnsh/defconfig          |  1 -
 boards/arm/sama5/giant-board/configs/nsh/defconfig             |  1 -
 boards/arm/sama5/giant-board/configs/sdmmc-net-nsh/defconfig   |  1 -
 boards/arm/sama5/giant-board/configs/sdmmcnsh/defconfig        |  1 -
 boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig         |  1 -
 boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig            |  1 -
 boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig       |  1 -
 boards/arm/sama5/sama5d3-xplained/configs/bridge/defconfig     |  1 -
 .../configs/ethernet-over-usb-2-high-speed/defconfig           |  1 -
 boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig        |  1 -
 boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig            |  1 -
 boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig           |  1 -
 boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig         |  1 -
 boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig             |  1 -
 boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig              |  1 -
 boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig        |  1 -
 boards/arm/sama5/sama5d3x-ek/configs/nxwm/defconfig            |  1 -
 boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig          |  1 -
 boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig         |  1 -
 boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig           |  1 -
 boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig         |  1 -
 boards/arm/sama5/sama5d4-ek/configs/elf/defconfig              |  1 -
 boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig             |  1 -
 boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig             |  1 -
 boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig              |  1 -
 boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig             |  1 -
 boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig          |  1 -
 boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig            |  1 -
 boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig         |  1 -
 boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig       |  1 -
 boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig       |  1 -
 boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig       |  1 -
 boards/arm/samd5e5/metro-m4/configs/nsh/defconfig              |  1 -
 boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig   |  1 -
 .../samv7/same70-xplained/configs/mrf24j40-starhub/defconfig   |  1 -
 boards/arm/samv7/same70-xplained/configs/netnsh/defconfig      |  1 -
 boards/arm/samv7/same70-xplained/configs/nsh/defconfig         |  1 -
 boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig      |  1 -
 boards/arm/samv7/samv71-xult/configs/knsh/defconfig            |  1 -
 boards/arm/samv7/samv71-xult/configs/module/defconfig          |  1 -
 .../arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig   |  1 -
 boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig        |  1 -
 boards/arm/samv7/samv71-xult/configs/netnsh/defconfig          |  1 -
 boards/arm/samv7/samv71-xult/configs/nsh/defconfig             |  1 -
 boards/arm/samv7/samv71-xult/configs/nxwm/defconfig            |  1 -
 boards/arm/samv7/samv71-xult/configs/vnc/defconfig             |  1 -
 boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig           |  1 -
 boards/arm/stm32/b-g474e-dpow1/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig         |  1 -
 .../stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig    |  1 -
 boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig |  1 -
 .../stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig    |  1 -
 .../stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig  |  1 -
 boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig          |  1 -
 boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig       |  1 -
 boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig |  1 -
 boards/arm/stm32/cloudctrl/configs/nsh/defconfig               |  1 -
 boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig            |  1 -
 boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig          |  1 -
 boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig        |  1 -
 boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig        |  1 -
 boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig     |  1 -
 boards/arm/stm32/maple/configs/nsh/defconfig                   |  1 -
 boards/arm/stm32/maple/configs/nx/defconfig                    |  1 -
 boards/arm/stm32/maple/configs/usbnsh/defconfig                |  1 -
 boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig     |  1 -
 boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig      |  1 -
 boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig          |  1 -
 boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig           |  1 -
 boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig      |  1 -
 boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig       |  1 -
 boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig       |  1 -
 boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig           |  1 -
 boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig           |  1 -
 boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig           |  1 -
 boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig           |  1 -
 boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig       |  1 -
 boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/nucleo-f303re/configs/adc/defconfig           |  1 -
 boards/arm/stm32/nucleo-f303re/configs/can/defconfig           |  1 -
 boards/arm/stm32/nucleo-f303re/configs/hello/defconfig         |  1 -
 boards/arm/stm32/nucleo-f303re/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig       |  1 -
 boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig           |  1 -
 boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig      |  1 -
 boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig           |  1 -
 boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig  |  1 -
 boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig           |  1 -
 boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig       |  1 -
 boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig         |  1 -
 boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig         |  1 -
 boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/nucleo-f412zg/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig        |  1 -
 boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/nucleo-f446re/configs/can/defconfig           |  1 -
 boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig      |  1 -
 .../stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig   |  1 -
 boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig      |  1 -
 boards/arm/stm32/nucleo-g431rb/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig           |  1 -
 boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig           |  2 +-
 boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig    |  1 -
 boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig       |  1 -
 boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig  |  1 -
 boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig    |  1 -
 .../stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig |  1 -
 .../arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig |  1 -
 boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig    |  1 -
 boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig       |  1 -
 boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig   |  1 -
 boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig     |  1 -
 boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig    |  1 -
 boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig |  1 -
 boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig    |  1 -
 boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig       |  1 -
 boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig  |  1 -
 boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig       |  1 -
 boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig       |  1 -
 boards/arm/stm32/olimex-stm32-p407/configs/audio/defconfig     |  1 -
 boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig     |  1 -
 boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig    |  1 -
 boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig      |  1 -
 boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig   |  1 -
 boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig      |  1 -
 boards/arm/stm32/olimex-stm32-p407/configs/module/defconfig    |  1 -
 boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig       |  1 -
 boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig    |  1 -
 boards/arm/stm32/olimexino-stm32/configs/can/defconfig         |  2 +-
 boards/arm/stm32/olimexino-stm32/configs/composite/defconfig   |  2 +-
 boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig         |  2 +-
 boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig    |  2 +-
 boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig        |  2 +-
 boards/arm/stm32/omnibusf4/configs/nsh/defconfig               |  1 -
 boards/arm/stm32/photon/configs/nsh/defconfig                  |  1 -
 boards/arm/stm32/photon/configs/rgbled/defconfig               |  1 -
 boards/arm/stm32/photon/configs/usbnsh/defconfig               |  1 -
 boards/arm/stm32/photon/configs/wlan/defconfig                 |  1 -
 boards/arm/stm32/shenzhou/configs/nsh/defconfig                |  1 -
 boards/arm/stm32/shenzhou/configs/nxwm/defconfig               |  1 -
 boards/arm/stm32/shenzhou/configs/thttpd/defconfig             |  1 -
 boards/arm/stm32/stm3210e-eval/configs/composite/defconfig     |  1 -
 boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig          |  1 -
 boards/arm/stm32/stm3210e-eval/configs/nx/defconfig            |  1 -
 boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig        |  1 -
 boards/arm/stm32/stm3210e-eval/configs/pm/defconfig            |  1 -
 boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig        |  1 -
 boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig     |  1 -
 boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig         |  1 -
 boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig       |  1 -
 boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig          |  1 -
 boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig          |  1 -
 boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig       |  1 -
 boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig         |  1 -
 boards/arm/stm32/stm3240g-eval/configs/discover/defconfig      |  1 -
 boards/arm/stm32/stm3240g-eval/configs/fb/defconfig            |  1 -
 boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig         |  1 -
 boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig       |  1 -
 boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig           |  1 -
 boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig          |  1 -
 boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig        |  1 -
 boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig          |  1 -
 boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig       |  1 -
 boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig     |  1 -
 boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig        |  1 -
 boards/arm/stm32/stm32_tiny/configs/nsh/defconfig              |  1 -
 boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig           |  1 -
 boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig         |  1 -
 boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig      |  1 -
 boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig   |  1 -
 boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig  |  1 -
 boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig  |  1 -
 .../arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig   |  1 -
 boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig   |  1 -
 boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig     |  1 -
 boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig |  1 -
 boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig   |  1 -
 boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig   |  1 -
 boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig     |  1 -
 boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig       |  1 -
 boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig       |  1 -
 .../arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig   |  1 -
 boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig    |  1 -
 boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig    |  1 -
 boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig   |  1 -
 boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig  |  1 -
 boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig   |  1 -
 boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig         |  1 -
 boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig    |  1 -
 boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig        |  1 -
 boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig     |  1 -
 boards/arm/stm32/stm32f411-minimum/configs/nsh/defconfig       |  1 -
 boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig        |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig        |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig   |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig         |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig    |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig        |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig       |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig        |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig    |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig       |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig     |  1 -
 boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/configs/audio/defconfig      |  1 -
 boards/arm/stm32/stm32f4discovery/configs/canard/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig    |  1 -
 boards/arm/stm32/stm32f4discovery/configs/elf/defconfig        |  1 -
 boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig    |  1 -
 boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig       |  1 -
 boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig    |  1 -
 boards/arm/stm32/stm32f4discovery/configs/lcd1602/defconfig    |  1 -
 boards/arm/stm32/stm32f4discovery/configs/lwl/defconfig        |  1 -
 boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig   |  1 -
 boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig    |  1 -
 boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig   |  1 -
 boards/arm/stm32/stm32f4discovery/configs/module/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig        |  1 -
 boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig    |  1 -
 boards/arm/stm32/stm32f4discovery/configs/pm/defconfig         |  1 -
 .../arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig   |  1 -
 boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig |  1 -
 boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig      |  1 -
 boards/arm/stm32/stm32f4discovery/configs/st7789/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig |  1 -
 boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig     |  1 -
 boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig       |  1 -
 boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig   |  1 -
 boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig    |  1 -
 boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig      |  2 +-
 boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig         |  2 +-
 boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig        |  2 +-
 boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig    |  1 -
 boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig  |  1 -
 boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig   |  1 -
 boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig      |  1 -
 .../arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig  |  1 -
 boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig    |  2 +-
 boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig    |  2 +-
 .../stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig  |  2 +-
 boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig |  2 +-
 boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig     |  2 +-
 boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig     |  2 +-
 boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig  |  2 +-
 boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig     |  2 +-
 boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig     |  2 +-
 boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig     |  2 +-
 boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig  |  2 +-
 .../arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig  |  2 +-
 .../arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig  |  2 +-
 boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig       |  1 -
 boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig    |  1 -
 boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig       |  1 -
 boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig    |  1 -
 boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig    |  1 -
 boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig       |  1 -
 boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig          |  1 -
 boards/arm/stm32f7/stm32f746g-disco/configs/audio/defconfig    |  1 -
 boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig       |  1 -
 boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig   |  1 -
 boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig      |  1 -
 boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig   |  1 -
 boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig      |  1 -
 boards/arm/stm32h7/nucleo-h743zi/configs/elf/defconfig         |  1 -
 boards/arm/stm32h7/nucleo-h743zi/configs/netnsh/defconfig      |  1 -
 boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig         |  1 -
 .../arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig   |  1 -
 boards/arm/stm32h7/nucleo-h743zi/configs/otg_fs_host/defconfig |  1 -
 boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig         |  1 -
 boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig      |  1 -
 boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig        |  1 -
 .../stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig    |  1 -
 .../stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig    |  1 -
 .../stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig  |  1 -
 boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig         |  1 -
 boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig        |  1 -
 boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig         |  1 -
 boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig         |  1 -
 boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig      |  1 -
 boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig         |  1 -
 boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig         |  1 -
 boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig    |  1 -
 boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig     |  1 -
 boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig    |  1 -
 boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig     |  1 -
 boards/arm/stm32l5/nucleo-l552ze/configs/nsh/defconfig         |  1 -
 boards/arm/stm32l5/stm32l562e-dk/configs/nsh/defconfig         |  1 -
 boards/arm/str71x/olimex-strp711/configs/nettest/defconfig     |  1 -
 boards/arm/str71x/olimex-strp711/configs/nsh/defconfig         |  1 -
 boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig             |  1 -
 boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig              |  1 -
 boards/arm/tiva/eagle100/configs/httpd/defconfig               |  1 -
 boards/arm/tiva/eagle100/configs/nettest/defconfig             |  1 -
 boards/arm/tiva/eagle100/configs/nsh/defconfig                 |  1 -
 boards/arm/tiva/eagle100/configs/nxflat/defconfig              |  1 -
 boards/arm/tiva/eagle100/configs/thttpd/defconfig              |  1 -
 boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig             |  1 -
 boards/arm/tiva/launchxl-cc1310/configs/nsh/defconfig          |  1 -
 boards/arm/tiva/launchxl-cc1312r1/configs/nsh/defconfig        |  1 -
 boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig             |  1 -
 boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig         |  1 -
 boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig              |  1 -
 boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig               |  1 -
 boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig        |  1 -
 boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig   |  1 -
 boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig          |  1 -
 boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig              |  1 -
 boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig               |  1 -
 boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig        |  1 -
 boards/arm/tiva/tm4c123g-launchpad/configs/mcp2515/defconfig   |  1 -
 boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig       |  1 -
 boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig      |  1 -
 boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig       |  1 -
 boards/arm/tms570/launchxl-tms57004/configs/nsh/defconfig      |  1 -
 boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig    |  1 -
 boards/arm/xmc4/xmc4500-relax/configs/nsh/defconfig            |  1 -
 boards/arm/xmc4/xmc4700-relax/configs/nsh/defconfig            |  1 -
 boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig             |  1 -
 boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig          |  1 -
 boards/avr/at90usb/micropendous3/configs/hello/defconfig       |  2 +-
 boards/avr/at90usb/teensy-2.0/configs/hello/defconfig          |  2 +-
 boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig            |  2 +-
 boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig         |  2 +-
 boards/avr/atmega/amber/configs/hello/defconfig                |  2 +-
 boards/avr/atmega/arduino-mega2560/configs/hello/defconfig     |  2 +-
 boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig       |  2 +-
 boards/avr/atmega/moteino-mega/configs/hello/defconfig         |  2 +-
 boards/avr/atmega/moteino-mega/configs/nsh/defconfig           |  2 +-
 boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig          |  2 +-
 boards/hc/m9s12/ne64badge/configs/ostest/defconfig             |  2 +-
 boards/mips/pic32mx/mirtoo/configs/nsh/defconfig               |  1 -
 boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig             |  1 -
 boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig   |  1 -
 boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig  |  1 -
 boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig          |  1 -
 boards/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig         |  1 -
 boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig      |  1 -
 boards/mips/pic32mx/ubw32/configs/nsh/defconfig                |  1 -
 boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig   |  1 -
 .../mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig  |  1 -
 boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig   |  1 -
 boards/misoc/lm32/misoc/configs/hello/defconfig                |  2 +-
 boards/misoc/lm32/misoc/configs/nsh/defconfig                  |  2 +-
 boards/or1k/mor1kx/or1k/configs/nsh/defconfig                  |  1 -
 boards/renesas/m16c/skp16c26/configs/ostest/defconfig          |  1 -
 boards/renesas/rx65n/rx65n-grrose/configs/ipv6/defconfig       |  1 -
 boards/renesas/rx65n/rx65n-grrose/configs/netnsh/defconfig     |  1 -
 boards/renesas/rx65n/rx65n-grrose/configs/nsh/defconfig        |  1 -
 boards/renesas/rx65n/rx65n-rsk1mb/configs/netnsh/defconfig     |  1 -
 boards/renesas/rx65n/rx65n-rsk1mb/configs/nsh/defconfig        |  1 -
 boards/renesas/rx65n/rx65n-rsk2mb/configs/ipv6/defconfig       |  1 -
 boards/renesas/rx65n/rx65n-rsk2mb/configs/netnsh/defconfig     |  1 -
 boards/renesas/rx65n/rx65n-rsk2mb/configs/nsh/defconfig        |  1 -
 boards/renesas/rx65n/rx65n/configs/nsh/defconfig               |  1 -
 boards/renesas/sh1/us7032evb1/configs/nsh/defconfig            |  1 -
 boards/renesas/sh1/us7032evb1/configs/ostest/defconfig         |  1 -
 boards/risc-v/bl602/bl602evb/configs/elf/defconfig             |  2 +-
 boards/risc-v/bl602/bl602evb/configs/fpu/defconfig             |  2 +-
 boards/risc-v/bl602/bl602evb/configs/gpio/defconfig            |  2 +-
 boards/risc-v/bl602/bl602evb/configs/i2c/defconfig             |  2 +-
 boards/risc-v/bl602/bl602evb/configs/nsh/defconfig             |  2 +-
 boards/risc-v/bl602/bl602evb/configs/spi/defconfig             |  2 +-
 boards/risc-v/bl602/bl602evb/configs/spiflash/defconfig        |  2 +-
 boards/risc-v/bl602/bl602evb/configs/timer/defconfig           |  2 +-
 boards/risc-v/esp32c3/esp32c3-devkit/configs/bmp180/defconfig  |  2 +-
 boards/risc-v/esp32c3/esp32c3-devkit/configs/gpio/defconfig    |  2 +-
 boards/risc-v/esp32c3/esp32c3-devkit/configs/nsh/defconfig     |  2 +-
 boards/risc-v/esp32c3/esp32c3-devkit/configs/timer/defconfig   |  2 +-
 boards/risc-v/esp32c3/esp32c3-devkit/configs/wapi/defconfig    |  1 -
 .../risc-v/esp32c3/esp32c3-devkit/configs/watchdog/defconfig   |  2 +-
 boards/risc-v/esp32c3/esp32c3-devkit/configs/watcher/defconfig |  2 +-
 boards/risc-v/fe310/hifive1-revb/configs/nsh/defconfig         |  2 +-
 boards/risc-v/k210/maix-bit/configs/smp/defconfig              |  1 -
 boards/risc-v/litex/arty_a7/configs/nsh/defconfig              |  2 +-
 boards/sim/sim/sim/configs/alsa/defconfig                      |  1 -
 boards/sim/sim/sim/configs/bas/defconfig                       |  1 -
 boards/sim/sim/sim/configs/bluetooth/defconfig                 |  1 -
 boards/sim/sim/sim/configs/bthcisock/defconfig                 |  1 -
 boards/sim/sim/sim/configs/btuart/defconfig                    |  1 -
 boards/sim/sim/sim/configs/configdata/defconfig                |  1 -
 boards/sim/sim/sim/configs/cxxtest/defconfig                   |  1 -
 boards/sim/sim/sim/configs/dsptest/defconfig                   |  1 -
 boards/sim/sim/sim/configs/duktape/defconfig                   |  1 -
 boards/sim/sim/sim/configs/ipforward/defconfig                 |  1 -
 boards/sim/sim/sim/configs/libcxxtest/defconfig                |  1 -
 boards/sim/sim/sim/configs/linuxi2c/defconfig                  |  1 -
 boards/sim/sim/sim/configs/minibasic/defconfig                 |  1 -
 boards/sim/sim/sim/configs/module/defconfig                    |  1 -
 boards/sim/sim/sim/configs/module32/defconfig                  |  1 -
 boards/sim/sim/sim/configs/mount/defconfig                     |  1 -
 boards/sim/sim/sim/configs/mtdpart/defconfig                   |  1 -
 boards/sim/sim/sim/configs/mtdrwb/defconfig                    |  1 -
 boards/sim/sim/sim/configs/nettest/defconfig                   |  1 -
 boards/sim/sim/sim/configs/nimble/defconfig                    |  1 -
 boards/sim/sim/sim/configs/nsh/defconfig                       |  1 -
 boards/sim/sim/sim/configs/nsh2/defconfig                      |  1 -
 boards/sim/sim/sim/configs/nshcromfs/defconfig                 |  1 -
 boards/sim/sim/sim/configs/nxffs/defconfig                     |  1 -
 boards/sim/sim/sim/configs/ostest/defconfig                    |  1 -
 boards/sim/sim/sim/configs/pf_ieee802154/defconfig             |  1 -
 boards/sim/sim/sim/configs/pktradio/defconfig                  |  1 -
 boards/sim/sim/sim/configs/rc/defconfig                        |  1 -
 boards/sim/sim/sim/configs/sensor/defconfig                    |  1 -
 boards/sim/sim/sim/configs/sixlowpan/defconfig                 |  1 -
 boards/sim/sim/sim/configs/sotest/defconfig                    |  1 -
 boards/sim/sim/sim/configs/sotest32/defconfig                  |  1 -
 boards/sim/sim/sim/configs/spiffs/defconfig                    |  1 -
 boards/sim/sim/sim/configs/tcpblaster/defconfig                |  1 -
 boards/sim/sim/sim/configs/tcploop/defconfig                   |  1 -
 boards/sim/sim/sim/configs/udgram/defconfig                    |  1 -
 boards/sim/sim/sim/configs/unionfs/defconfig                   |  1 -
 boards/sim/sim/sim/configs/userfs/defconfig                    |  1 -
 boards/sim/sim/sim/configs/ustream/defconfig                   |  1 -
 boards/sim/sim/sim/configs/vpnkit/defconfig                    |  1 -
 boards/x86/qemu/qemu-i486/configs/nsh/defconfig                |  1 -
 boards/x86/qemu/qemu-i486/configs/ostest/defconfig             |  1 -
 boards/x86_64/intel64/qemu-intel64/configs/nsh/defconfig       |  1 -
 boards/x86_64/intel64/qemu-intel64/configs/ostest/defconfig    |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/aes/defconfig        |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig       |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/mcp2515/defconfig    |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig   |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig     |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig        |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig     |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig         |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig      |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig     |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig        |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig   |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig      |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig       |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig   |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig   |  1 -
 boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig    |  1 -
 .../xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig |  1 -
 boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig   |  1 -
 boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig  |  1 -
 boards/xtensa/esp32/esp32-wrover-kit/configs/bmp180/defconfig  |  1 -
 boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig    |  1 -
 boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig    |  1 -
 boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig     |  1 -
 boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig    |  1 -
 boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig          |  1 -
 boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig       |  1 -
 boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig       |  1 -
 boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig         |  1 -
 boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig         |  1 -
 boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig       |  1 -
 boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig           |  1 -
 boards/z80/ez80/ez80f910200zco/configs/poll/defconfig          |  1 -
 boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig          |  1 -
 boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig            |  1 -
 boards/z80/ez80/makerlisp/configs/sdboot/defconfig             |  2 +-
 boards/z80/ez80/z20x/configs/hello/defconfig                   |  1 -
 boards/z80/ez80/z20x/configs/nsh/defconfig                     |  1 -
 boards/z80/ez80/z20x/configs/sdboot/defconfig                  |  2 +-
 boards/z80/ez80/z20x/configs/w25boot/defconfig                 |  2 +-
 boards/z80/z180/p112/configs/ostest/defconfig                  |  2 +-
 boards/z80/z8/z8encore000zco/configs/ostest/defconfig          |  2 +-
 boards/z80/z8/z8f64200100kit/configs/ostest/defconfig          |  2 +-
 boards/z80/z80/z80sim/configs/nsh/defconfig                    |  2 +-
 boards/z80/z80/z80sim/configs/ostest/defconfig                 |  2 +-
 drivers/usbhost/Kconfig                                        |  2 +-
 libs/libc/zoneinfo/README.txt                                  |  4 ----
 tools/mkromfsimg.sh                                            | 10 ----------
 681 files changed, 72 insertions(+), 695 deletions(-)

diff --git a/Documentation/applications/nsh/installation.rst b/Documentation/applications/nsh/installation.rst
index f8e0c79..2df8547 100644
--- a/Documentation/applications/nsh/installation.rst
+++ b/Documentation/applications/nsh/installation.rst
@@ -45,9 +45,6 @@ also depends on:
   -  ``CONFIG_DISABLE_MOUNTPOINT=n``. If mount point support is disabled,
      then you cannot mount *any* file systems.
 
-  -  ``CONFIG_NFILE_DESCRIPTORS > 4``. Of course you have to have file
-     descriptions to use any thing in the file system.
-
   -  ``CONFIG_FS_ROMFS`` enabled. This option enables ROMFS file system
      support.
 
diff --git a/Documentation/applications/nsh/nsh.rst b/Documentation/applications/nsh/nsh.rst
index 06d0eb5..f89b794 100644
--- a/Documentation/applications/nsh/nsh.rst
+++ b/Documentation/applications/nsh/nsh.rst
@@ -261,7 +261,6 @@ configuration settings <#nshconfiguration>`__. This capability
 also depends on:
 
   -  ``CONFIG_DISABLE_MOUNTPOINT`` not set
-  -  ``CONFIG_NFILE_DESCRIPTORS`` > 4
   -  ``CONFIG_FS_ROMFS`` enabled
 
 **Default Start-Up Behavior**. The implementation that is provided
diff --git a/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig b/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig
index cf2512d..9f7c2d0 100644
--- a/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig
+++ b/boards/arm/a1x/pcduino-a10/configs/nsh/defconfig
@@ -31,7 +31,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig b/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig
index a27d491..0dce351 100644
--- a/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig
+++ b/boards/arm/am335x/beaglebone-black/configs/lcd/defconfig
@@ -33,7 +33,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig b/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig
index a277e76..1146a77 100644
--- a/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig
+++ b/boards/arm/am335x/beaglebone-black/configs/nsh/defconfig
@@ -31,7 +31,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/c5471/c5471evm/configs/httpd/defconfig b/boards/arm/c5471/c5471evm/configs/httpd/defconfig
index fcd35a3..c943b48 100644
--- a/boards/arm/c5471/c5471evm/configs/httpd/defconfig
+++ b/boards/arm/c5471/c5471evm/configs/httpd/defconfig
@@ -29,7 +29,6 @@ CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_RAM_SIZE=285212672
 CONFIG_RAM_START=0
diff --git a/boards/arm/c5471/c5471evm/configs/nettest/defconfig b/boards/arm/c5471/c5471evm/configs/nettest/defconfig
index 7fd8e61..59c2f1c 100644
--- a/boards/arm/c5471/c5471evm/configs/nettest/defconfig
+++ b/boards/arm/c5471/c5471evm/configs/nettest/defconfig
@@ -28,7 +28,6 @@ CONFIG_NET_ICMP=y
 CONFIG_NET_MAX_LISTENPORTS=8
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_RAM_SIZE=285212672
 CONFIG_RAM_START=0
diff --git a/boards/arm/c5471/c5471evm/configs/nsh/defconfig b/boards/arm/c5471/c5471evm/configs/nsh/defconfig
index 3c9220a..c596024 100644
--- a/boards/arm/c5471/c5471evm/configs/nsh/defconfig
+++ b/boards/arm/c5471/c5471evm/configs/nsh/defconfig
@@ -38,7 +38,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_READLINE=y
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_RAM_SIZE=285212672
diff --git a/boards/arm/cxd56xx/spresense/configs/audio/defconfig b/boards/arm/cxd56xx/spresense/configs/audio/defconfig
index 3e31807..9f170db 100644
--- a/boards/arm/cxd56xx/spresense/configs/audio/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/audio/defconfig
@@ -53,7 +53,6 @@ CONFIG_MTD_SMART=y
 CONFIG_MTD_SMART_ENABLE_CRC=y
 CONFIG_MTD_SMART_SECTOR_SIZE=4096
 CONFIG_NAME_MAX=765
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig b/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig
index ecb20b8..f2a0b41 100644
--- a/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/audio_sdk/defconfig
@@ -51,7 +51,6 @@ CONFIG_MTD_SMART=y
 CONFIG_MTD_SMART_ENABLE_CRC=y
 CONFIG_MTD_SMART_SECTOR_SIZE=4096
 CONFIG_NAME_MAX=765
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/cxd56xx/spresense/configs/camera/defconfig b/boards/arm/cxd56xx/spresense/configs/camera/defconfig
index ec6368b..4b25869 100644
--- a/boards/arm/cxd56xx/spresense/configs/camera/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/camera/defconfig
@@ -52,7 +52,6 @@ CONFIG_MTD_SMART=y
 CONFIG_MTD_SMART_ENABLE_CRC=y
 CONFIG_MTD_SMART_SECTOR_SIZE=4096
 CONFIG_NAME_MAX=765
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/cxd56xx/spresense/configs/elf/defconfig b/boards/arm/cxd56xx/spresense/configs/elf/defconfig
index ad2a4c5..964cd58 100644
--- a/boards/arm/cxd56xx/spresense/configs/elf/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/elf/defconfig
@@ -33,7 +33,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=1572864
diff --git a/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig b/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig
index f6b1844..a49ec70 100644
--- a/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/example_camera/defconfig
@@ -52,7 +52,6 @@ CONFIG_MTD_SMART=y
 CONFIG_MTD_SMART_ENABLE_CRC=y
 CONFIG_MTD_SMART_SECTOR_SIZE=4096
 CONFIG_NAME_MAX=765
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig
index 2eab6ef..d483e50 100644
--- a/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/example_lcd/defconfig
@@ -68,7 +68,6 @@ CONFIG_MTD_SMART=y
 CONFIG_MTD_SMART_ENABLE_CRC=y
 CONFIG_MTD_SMART_SECTOR_SIZE=4096
 CONFIG_NAME_MAX=765
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/cxd56xx/spresense/configs/lcd/defconfig b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig
index 4b0cf2d..6d3af92 100644
--- a/boards/arm/cxd56xx/spresense/configs/lcd/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/lcd/defconfig
@@ -59,7 +59,6 @@ CONFIG_MTD_SMART=y
 CONFIG_MTD_SMART_ENABLE_CRC=y
 CONFIG_MTD_SMART_SECTOR_SIZE=4096
 CONFIG_NAME_MAX=765
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/cxd56xx/spresense/configs/lte/defconfig b/boards/arm/cxd56xx/spresense/configs/lte/defconfig
index 86d384b..5b1f9b7 100644
--- a/boards/arm/cxd56xx/spresense/configs/lte/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/lte/defconfig
@@ -51,7 +51,6 @@ CONFIG_MTD_SMART=y
 CONFIG_MTD_SMART_ENABLE_CRC=y
 CONFIG_MTD_SMART_SECTOR_SIZE=4096
 CONFIG_NAME_MAX=765
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/cxd56xx/spresense/configs/module/defconfig b/boards/arm/cxd56xx/spresense/configs/module/defconfig
index f3ec8fa..79d4467 100644
--- a/boards/arm/cxd56xx/spresense/configs/module/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/module/defconfig
@@ -35,7 +35,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=16
 CONFIG_MODULE=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=1572864
diff --git a/boards/arm/cxd56xx/spresense/configs/mpy/defconfig b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig
index 9486407..3e8ddc7 100644
--- a/boards/arm/cxd56xx/spresense/configs/mpy/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/mpy/defconfig
@@ -61,7 +61,6 @@ CONFIG_MTD_SMART=y
 CONFIG_MTD_SMART_ENABLE_CRC=y
 CONFIG_MTD_SMART_SECTOR_SIZE=4096
 CONFIG_NAME_MAX=765
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/cxd56xx/spresense/configs/nsh/defconfig b/boards/arm/cxd56xx/spresense/configs/nsh/defconfig
index aee5f13..d215a85 100644
--- a/boards/arm/cxd56xx/spresense/configs/nsh/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/nsh/defconfig
@@ -31,7 +31,6 @@ CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig b/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig
index f1cfb61..8801b49 100644
--- a/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/posix_spawn/defconfig
@@ -38,7 +38,6 @@ CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=1572864
diff --git a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
index 36a3ada..0a7517c 100644
--- a/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/rndis/defconfig
@@ -101,7 +101,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_BINDTODEVICE=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_TELNETD=y
diff --git a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig
index 31d85cc..7cb9cbe 100644
--- a/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/rndis_smp/defconfig
@@ -110,7 +110,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_BINDTODEVICE=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_TELNETD=y
diff --git a/boards/arm/cxd56xx/spresense/configs/smp/defconfig b/boards/arm/cxd56xx/spresense/configs/smp/defconfig
index 0b037ef..c414e68 100644
--- a/boards/arm/cxd56xx/spresense/configs/smp/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/smp/defconfig
@@ -33,7 +33,6 @@ CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig b/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig
index a240689..7bf95b0 100644
--- a/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/usbmsc/defconfig
@@ -56,7 +56,6 @@ CONFIG_MTD_SMART=y
 CONFIG_MTD_SMART_ENABLE_CRC=y
 CONFIG_MTD_SMART_SECTOR_SIZE=4096
 CONFIG_NAME_MAX=765
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig b/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig
index 701b00a..c801f29 100644
--- a/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/usbnsh/defconfig
@@ -49,7 +49,6 @@ CONFIG_MTD_SMART=y
 CONFIG_MTD_SMART_ENABLE_CRC=y
 CONFIG_MTD_SMART_SECTOR_SIZE=4096
 CONFIG_NAME_MAX=765
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
index bf8960e..b452d34 100644
--- a/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/wifi/defconfig
@@ -109,7 +109,6 @@ CONFIG_NET_UDP_NO_STACK=y
 CONFIG_NET_USRSOCK=y
 CONFIG_NET_USRSOCK_CONNS=16
 CONFIG_NET_USRSOCK_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_ARP=y
diff --git a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
index 985d820..951c38b 100644
--- a/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
+++ b/boards/arm/cxd56xx/spresense/configs/wifi_smp/defconfig
@@ -113,7 +113,6 @@ CONFIG_NET_UDP_NO_STACK=y
 CONFIG_NET_USRSOCK=y
 CONFIG_NET_USRSOCK_CONNS=16
 CONFIG_NET_USRSOCK_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_ARP=y
diff --git a/boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig b/boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig
index cfa0196..c6987c7 100644
--- a/boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig
+++ b/boards/arm/dm320/ntosd-dm320/configs/nettest/defconfig
@@ -29,7 +29,6 @@ CONFIG_NET_ICMP=y
 CONFIG_NET_MAX_LISTENPORTS=8
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_RAM_SIZE=33554432
 CONFIG_RAM_START=0x01100000
diff --git a/boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig b/boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig
index f29b97d..51957bd 100644
--- a/boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig
+++ b/boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig
@@ -39,7 +39,6 @@ CONFIG_NET_MAX_LISTENPORTS=8
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_READLINE=y
 CONFIG_NSH_ROMFSETC=y
 CONFIG_PTHREAD_STACK_DEFAULT=4096
diff --git a/boards/arm/dm320/ntosd-dm320/configs/poll/defconfig b/boards/arm/dm320/ntosd-dm320/configs/poll/defconfig
index cada3f3..354abb8 100644
--- a/boards/arm/dm320/ntosd-dm320/configs/poll/defconfig
+++ b/boards/arm/dm320/ntosd-dm320/configs/poll/defconfig
@@ -30,7 +30,6 @@ CONFIG_NET_MAX_LISTENPORTS=8
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PIPES=y
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_RAM_SIZE=33554432
diff --git a/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig b/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig
index 31024f4..52a8e61 100644
--- a/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig
+++ b/boards/arm/dm320/ntosd-dm320/configs/udp/defconfig
@@ -31,7 +31,6 @@ CONFIG_NET_ICMP=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_RAM_SIZE=33554432
 CONFIG_RAM_START=0x01100000
diff --git a/boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig b/boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig
index 0aec196..40127e1 100644
--- a/boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig
+++ b/boards/arm/dm320/ntosd-dm320/configs/webserver/defconfig
@@ -30,7 +30,6 @@ CONFIG_NET_ICMP=y
 CONFIG_NET_MAX_LISTENPORTS=8
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_RAM_SIZE=33554432
 CONFIG_RAM_START=0x01100000
diff --git a/boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig b/boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig
index d87060e..00e51a6 100644
--- a/boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig
+++ b/boards/arm/efm32/efm32-g8xx-stk/configs/nsh/defconfig
@@ -22,7 +22,6 @@ CONFIG_EFM32_LEUART0=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_LEUART0_SERIAL_CONSOLE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILEIOSIZE=256
 CONFIG_NSH_LINELEN=78
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig b/boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig
index 702b1d4..b044d84 100644
--- a/boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig
+++ b/boards/arm/efm32/efm32gg-stk3700/configs/nsh/defconfig
@@ -23,7 +23,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_LEUART0_BAUD=9600
 CONFIG_LEUART0_SERIAL_CONSOLE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILEIOSIZE=256
 CONFIG_NSH_LINELEN=78
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig b/boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig
index 81a6f29..3cf91e1 100644
--- a/boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig
+++ b/boards/arm/efm32/olimex-efm32g880f128-stk/configs/nsh/defconfig
@@ -22,7 +22,6 @@ CONFIG_EFM32_LEUART1=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_LEUART1_SERIAL_CONSOLE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILEIOSIZE=256
 CONFIG_NSH_LINELEN=78
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
index 326fa92..3549e81 100644
--- a/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/netnsh/defconfig
@@ -62,7 +62,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig
index 82f6382..3fd87d5 100644
--- a/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/netnsh_smp/defconfig
@@ -61,7 +61,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig b/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig
index b804cde..1dd0565 100644
--- a/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/nsh/defconfig
@@ -36,7 +36,6 @@ CONFIG_IMX6_UART1=y
 CONFIG_IMX_DDR_SIZE=1073741824
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/imx6/sabre-6quad/configs/smp/defconfig b/boards/arm/imx6/sabre-6quad/configs/smp/defconfig
index 0b0f4b6..1c924ec 100644
--- a/boards/arm/imx6/sabre-6quad/configs/smp/defconfig
+++ b/boards/arm/imx6/sabre-6quad/configs/smp/defconfig
@@ -36,7 +36,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IMX6_UART1=y
 CONFIG_IMX_DDR_SIZE=1073741824
 CONFIG_INTELHEX_BINARY=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig
index 9a7f442..8fc309f 100644
--- a/boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig
+++ b/boards/arm/imxrt/imxrt1020-evk/configs/netnsh/defconfig
@@ -43,7 +43,6 @@ CONFIG_NET_ICMP_SOCKET=y
 CONFIG_NET_IGMP=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig
index eabb917..c4bc1b5 100644
--- a/boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig
+++ b/boards/arm/imxrt/imxrt1020-evk/configs/nsh/defconfig
@@ -31,7 +31,6 @@ CONFIG_LPUART1_RXBUFSIZE=1024
 CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_LPUART1_TXBUFSIZE=1024
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig b/boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig
index db59412..e3e4b8d 100644
--- a/boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig
+++ b/boards/arm/imxrt/imxrt1020-evk/configs/usdhc/defconfig
@@ -48,7 +48,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MM_IOB=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDOPT_DD_STATS=y
diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig
index 0c9525b..b13be81 100644
--- a/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig
+++ b/boards/arm/imxrt/imxrt1050-evk/configs/knsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_IMXRT_LPUART1=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_DISABLE_MKRD=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig
index 01f956b..890b049 100644
--- a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig
+++ b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/defconfig
@@ -27,7 +27,6 @@ CONFIG_LIBC_LOCALTIME=y
 CONFIG_LIBM=y
 CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig
index 283f698..31db8b1 100644
--- a/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig
+++ b/boards/arm/imxrt/imxrt1050-evk/configs/netnsh/defconfig
@@ -47,7 +47,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_WRITE_BUFFERS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig
index e7efbcb..82a2723 100644
--- a/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig
+++ b/boards/arm/imxrt/imxrt1050-evk/configs/nsh/defconfig
@@ -24,7 +24,6 @@ CONFIG_IMXRT_LPUART1=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/can/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/can/defconfig
index eb1ffce..e260ab9 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/can/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/can/defconfig
@@ -63,7 +63,6 @@ CONFIG_NET_CAN_NOTIFIER=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_STATISTICS=y
 CONFIG_NET_TIMESTAMP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/canfd/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/canfd/defconfig
index 5c80b33..418a49c 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/canfd/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/canfd/defconfig
@@ -64,7 +64,6 @@ CONFIG_NET_CAN_NOTIFIER=y
 CONFIG_NET_CAN_SOCK_OPTS=y
 CONFIG_NET_STATISTICS=y
 CONFIG_NET_TIMESTAMP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig
index c2797d1..2fe1cda 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/knsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_IMXRT_LPUART1=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_DISABLE_MKRD=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig
index 32bf55c..e585367 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/libcxxtest/defconfig
@@ -27,7 +27,6 @@ CONFIG_LIBC_LOCALTIME=y
 CONFIG_LIBM=y
 CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig
index 88e1c2b..9a3d2b3 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/lvgl/defconfig
@@ -46,7 +46,6 @@ CONFIG_LV_HOR_RES=480
 CONFIG_LV_VER_RES=272
 CONFIG_MAX_TASKS=16
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig
index 71bcf62..ea596c1 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/netnsh/defconfig
@@ -53,7 +53,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_WRITE_BUFFERS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig
index e2a48f4..78ca4c5 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/nsh/defconfig
@@ -24,7 +24,6 @@ CONFIG_IMXRT_LPUART1=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig b/boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig
index 05f6e7e..8636ce1 100644
--- a/boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig
+++ b/boards/arm/imxrt/imxrt1060-evk/configs/nshocram/defconfig
@@ -29,7 +29,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig
index cfecc87..99f5488 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/can-4.1/defconfig
@@ -41,7 +41,6 @@ CONFIG_NET_CAN_NOTIFIER=y
 CONFIG_NET_CAN_SOCK_OPTS=y
 CONFIG_NET_STATISTICS=y
 CONFIG_NET_TIMESTAMP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/imxrt/teensy-4.x/configs/lcd-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/lcd-4.1/defconfig
index 89ba718..aba08c9 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/lcd-4.1/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/lcd-4.1/defconfig
@@ -33,7 +33,6 @@ CONFIG_LCD_FRAMEBUFFER=y
 CONFIG_LCD_PORTRAIT=y
 CONFIG_LCD_ST7789=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig
index 5adbaff7..bf9284e 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/netnsh-4.1/defconfig
@@ -51,7 +51,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_WRITE_BUFFERS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig b/boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig
index 2d0060e..d5d367b 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/nsh-4.0/defconfig
@@ -26,7 +26,6 @@ CONFIG_IMXRT_LPUART6=y
 CONFIG_IMXRT_USBDEV=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig
index 0159f15..4386bf2 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/nsh-4.1/defconfig
@@ -26,7 +26,6 @@ CONFIG_IMXRT_LPUART1=y
 CONFIG_IMXRT_USBDEV=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig b/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig
index eed4af2..ce1a690 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig
@@ -104,7 +104,6 @@ CONFIG_NET_TCP_KEEPALIVE=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_WRITE_BUFFERS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig b/boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig
index 6666da9..81577d1 100644
--- a/boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig
+++ b/boards/arm/imxrt/teensy-4.x/configs/sd-4.1/defconfig
@@ -37,7 +37,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig b/boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig
index 51bd79a..c7a7bbd 100644
--- a/boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig
+++ b/boards/arm/kinetis/freedom-k28f/configs/nsh/defconfig
@@ -26,7 +26,6 @@ CONFIG_KINETIS_SERIALBRK_BSDCOMPAT=y
 CONFIG_KINETIS_UART_BREAKS=y
 CONFIG_LPUART0_SERIAL_CONSOLE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/kinetis/freedom-k28f/configs/nshsdusb/defconfig b/boards/arm/kinetis/freedom-k28f/configs/nshsdusb/defconfig
index f1191f3..7f2936a 100644
--- a/boards/arm/kinetis/freedom-k28f/configs/nshsdusb/defconfig
+++ b/boards/arm/kinetis/freedom-k28f/configs/nshsdusb/defconfig
@@ -58,7 +58,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/kinetis/freedom-k64f/configs/cdcacm/defconfig b/boards/arm/kinetis/freedom-k64f/configs/cdcacm/defconfig
index 6c678fe..30aaafa 100644
--- a/boards/arm/kinetis/freedom-k64f/configs/cdcacm/defconfig
+++ b/boards/arm/kinetis/freedom-k64f/configs/cdcacm/defconfig
@@ -41,7 +41,6 @@ CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/kinetis/freedom-k64f/configs/demo/defconfig b/boards/arm/kinetis/freedom-k64f/configs/demo/defconfig
index 6e595a9..5243de1 100644
--- a/boards/arm/kinetis/freedom-k64f/configs/demo/defconfig
+++ b/boards/arm/kinetis/freedom-k64f/configs/demo/defconfig
@@ -51,7 +51,6 @@ CONFIG_NET_BROADCAST=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig b/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig
index c32d236..cb31521 100644
--- a/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig
+++ b/boards/arm/kinetis/freedom-k64f/configs/netnsh/defconfig
@@ -45,7 +45,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig b/boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig
index beee227..da0762b 100644
--- a/boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig
+++ b/boards/arm/kinetis/freedom-k64f/configs/nsh/defconfig
@@ -40,7 +40,6 @@ CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig b/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig
index 48c6a34..7928399 100644
--- a/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig
+++ b/boards/arm/kinetis/freedom-k66f/configs/netnsh/defconfig
@@ -54,7 +54,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig b/boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig
index 11d1fd8..a44c270 100644
--- a/boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig
+++ b/boards/arm/kinetis/freedom-k66f/configs/nsh/defconfig
@@ -66,7 +66,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig b/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig
index e67e5f5..69f8ede 100644
--- a/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig
+++ b/boards/arm/kinetis/kwikstik-k40/configs/ostest/defconfig
@@ -22,7 +22,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_KINETIS_UART5=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=65536
 CONFIG_RAM_START=0x1fff8000
diff --git a/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig b/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig
index 6a3f7e0..f118ce4 100644
--- a/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig
+++ b/boards/arm/kinetis/teensy-3.x/configs/nsh/defconfig
@@ -30,7 +30,6 @@ CONFIG_KINETIS_UART0=y
 CONFIG_KINETIS_UARTFIFOS=y
 CONFIG_KINETIS_UART_BREAKS=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig b/boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig
index 47b6afa..531d528 100644
--- a/boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig
+++ b/boards/arm/kinetis/teensy-3.x/configs/usbnsh/defconfig
@@ -28,7 +28,6 @@ CONFIG_KINETIS_UARTFIFOS=y
 CONFIG_KINETIS_UART_BREAKS=y
 CONFIG_KINETIS_USBOTG=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig b/boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig
index 12c6e0b..7762851 100644
--- a/boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig
+++ b/boards/arm/kinetis/twr-k60n512/configs/nsh/defconfig
@@ -22,7 +22,6 @@ CONFIG_FS_FAT=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_KINETIS_UART3=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig b/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig
index 0738bd3..e12a095 100644
--- a/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig
+++ b/boards/arm/kinetis/twr-k64f120m/configs/netnsh/defconfig
@@ -41,7 +41,6 @@ CONFIG_NET_ICMP_SOCKET=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig b/boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig
index 02b33d8..0445793 100644
--- a/boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig
+++ b/boards/arm/kinetis/twr-k64f120m/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_KINETIS_UART1=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig
index d464a47..2afc0a1 100644
--- a/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig
+++ b/boards/arm/kl/freedom-kl25z/configs/nsh/defconfig
@@ -32,7 +32,7 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=8
 CONFIG_MM_SMALL=y
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
diff --git a/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig
index e69e1ee..1cf9c85 100644
--- a/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig
+++ b/boards/arm/kl/freedom-kl26z/configs/nsh/defconfig
@@ -32,7 +32,7 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=8
 CONFIG_MM_SMALL=y
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
diff --git a/boards/arm/kl/teensy-lc/configs/nsh/defconfig b/boards/arm/kl/teensy-lc/configs/nsh/defconfig
index af5d00d..89a6c0f 100644
--- a/boards/arm/kl/teensy-lc/configs/nsh/defconfig
+++ b/boards/arm/kl/teensy-lc/configs/nsh/defconfig
@@ -46,7 +46,7 @@ CONFIG_KL_UART0=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=8
 CONFIG_MM_SMALL=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig
index 3a6d942..0549b4e 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig
@@ -71,7 +71,6 @@ CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_MTD=y
 CONFIG_NAME_MAX=765
 CONFIG_NETUTILS_CODECS=y
-CONFIG_NFILE_DESCRIPTORS=45
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDOPT_DD_STATS=y
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
index b3f2fc8..0a9f73e 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig
@@ -104,7 +104,6 @@ CONFIG_NET_TUN=y
 CONFIG_NET_TUN_PKTSIZE=1500
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_BINDTODEVICE=y
-CONFIG_NFILE_DESCRIPTORS=45
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDOPT_DD_STATS=y
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig
index 6bf2f26..7c5a09b 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/elf/defconfig
@@ -38,7 +38,6 @@ CONFIG_MAX_TASKS=64
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_NAME_MAX=765
 CONFIG_NETUTILS_CODECS=y
-CONFIG_NFILE_DESCRIPTORS=45
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PIPES=y
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig
index d262412..33d08c2 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/ipl2/defconfig
@@ -39,7 +39,6 @@ CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MTD=y
 CONFIG_NAME_MAX=765
 CONFIG_NETUTILS_CODECS=y
-CONFIG_NFILE_DESCRIPTORS=45
 CONFIG_PIPES=y
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig
index 071df51..4a41a00 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig
@@ -52,7 +52,6 @@ CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_NAME_MAX=765
 CONFIG_NETUTILS_CODECS=y
-CONFIG_NFILE_DESCRIPTORS=45
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_DISABLE_BASENAME=y
 CONFIG_NSH_DISABLE_CP=y
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig
index dc0f765..a50cc7a 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig
@@ -24,7 +24,6 @@ CONFIG_LC823450_MTM0_TICK=y
 CONFIG_LC823450_SPIFI=y
 CONFIG_LC823450_UART0=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUTTX_USERSPACE=0x05020000
 CONFIG_PASS1_BUILDIR="boards/arm/lc823450/lc823450-xgevk/kernel"
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig
index 5d3006f..b67b386 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig
@@ -108,7 +108,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_BINDTODEVICE=y
-CONFIG_NFILE_DESCRIPTORS=45
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_CMDOPT_DD_STATS=y
 CONFIG_NSH_DISABLE_BASENAME=y
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig
index 191269d..1d37c23 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig
@@ -58,7 +58,6 @@ CONFIG_MEMSET_OPTSPEED=y
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_NAME_MAX=765
 CONFIG_NETUTILS_CODECS=y
-CONFIG_NFILE_DESCRIPTORS=45
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_BASENAME=y
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig
index 205810b..c4438e5 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/posix_spawn/defconfig
@@ -37,7 +37,6 @@ CONFIG_MAX_TASKS=64
 CONFIG_MEMSET_OPTSPEED=y
 CONFIG_NAME_MAX=765
 CONFIG_NETUTILS_CODECS=y
-CONFIG_NFILE_DESCRIPTORS=45
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PIPES=y
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
index 8733604..2aeb535 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig
@@ -107,7 +107,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_BINDTODEVICE=y
-CONFIG_NFILE_DESCRIPTORS=45
 CONFIG_NFS=y
 CONFIG_NFS_STATISTICS=y
 CONFIG_NSH_ARCHINIT=y
diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig
index ddc88c8..9bcfe2f 100644
--- a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig
+++ b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig
@@ -68,7 +68,6 @@ CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_MTD=y
 CONFIG_NAME_MAX=765
 CONFIG_NETUTILS_CODECS=y
-CONFIG_NFILE_DESCRIPTORS=45
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CMDOPT_DD_STATS=y
diff --git a/boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig b/boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig
index 7d27d30..561d275 100644
--- a/boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lincoln60/configs/netnsh/defconfig
@@ -47,7 +47,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig
index 72057e2..8a5027c 100644
--- a/boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lincoln60/configs/nsh/defconfig
@@ -20,7 +20,6 @@ CONFIG_LPC17_40_SSP0=y
 CONFIG_LPC17_40_UART0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig b/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig
index 82ac6fc..dbbacee 100644
--- a/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig
+++ b/boards/arm/lpc17xx_40xx/lincoln60/configs/thttpd-binfs/defconfig
@@ -49,7 +49,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=12
 CONFIG_NET_TCP_WRITE_BUFFERS=y
-CONFIG_NFILE_DESCRIPTORS=20
 CONFIG_NUNGET_CHARS=0
 CONFIG_PIPES=y
 CONFIG_RAM_SIZE=32768
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig
index e97cdb1..af315f1 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/defconfig
@@ -36,7 +36,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_LOSETUP=y
 CONFIG_NSH_DISABLE_MKRD=y
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig
index e3b955d..942162c 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/nsh/defconfig
@@ -59,7 +59,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_NOTIFIER=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig
index 12e283d..54363b3 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/defconfig
@@ -33,7 +33,6 @@ CONFIG_LPC17_40_GPDMA=y
 CONFIG_LPC17_40_UART0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_LOSETUP=y
 CONFIG_NSH_DISABLE_MKRD=y
diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig
index 0192dbb..eb58081 100644
--- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/nsh/defconfig
@@ -29,7 +29,6 @@ CONFIG_LPC17_40_GPDMA=y
 CONFIG_LPC17_40_UART0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig
index c4c67b7..ad19dc1 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/dhcpd/defconfig
@@ -36,7 +36,6 @@ CONFIG_NET_ICMP=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUNGET_CHARS=0
 CONFIG_RAM_SIZE=32768
 CONFIG_RAM_START=0x10000000
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig
index 013e0ce..ed5d985 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nsh/defconfig
@@ -49,7 +49,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig
index e4701c7..e6d48a1 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/nx/defconfig
@@ -38,7 +38,6 @@ CONFIG_LPC17_40_UART3=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=12
 CONFIG_NX=y
 CONFIG_NXFONT_SANS23X27=y
 CONFIG_NXSTART_EXTERNINIT=y
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig
index 87207ae..55a9eab 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/defconfig
@@ -37,7 +37,6 @@ CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
-CONFIG_NFILE_DESCRIPTORS=24
 CONFIG_NUNGET_CHARS=0
 CONFIG_NXFLAT=y
 CONFIG_PIPES=y
diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig
index 003d652..09af8a8 100644
--- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig
+++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/usbmsc/defconfig
@@ -27,7 +27,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPICLOCK=12500000
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=32768
 CONFIG_RAM_START=0x10000000
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig
index 14905df..67de7e7 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig
@@ -122,7 +122,6 @@ CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_BINDTODEVICE=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFS=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig
index ac9a4e1..69e0da3 100644
--- a/boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/mbed/configs/nsh/defconfig
@@ -29,7 +29,6 @@ CONFIG_MMCSD=y
 CONFIG_MMCSD_SPICLOCK=12500000
 CONFIG_MM_REGIONS=2
 CONFIG_MTD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig
index aa01aee..d297580 100644
--- a/boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/mcb1700/configs/nsh/defconfig
@@ -30,7 +30,6 @@ CONFIG_MMCSD=y
 CONFIG_MMCSD_SPICLOCK=12500000
 CONFIG_MM_REGIONS=2
 CONFIG_MTD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig
index d4463fc..8b27336 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/ftpc/defconfig
@@ -50,7 +50,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=24
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig
index aae1d0c..61c6c07 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidkbd/defconfig
@@ -30,7 +30,6 @@ CONFIG_LPC17_40_USBHOST=y
 CONFIG_LPC17_40_USBHOST_TDBUFFERS=3
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig
index 586e85a..e05d75a 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/hidmouse/defconfig
@@ -47,7 +47,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_SPLIT=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig
index 84758a3..992203a 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nettest/defconfig
@@ -38,7 +38,6 @@ CONFIG_NET_ICMP=y
 CONFIG_NET_MAX_LISTENPORTS=8
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUNGET_CHARS=0
 CONFIG_RAM_SIZE=32768
 CONFIG_RAM_START=0x10000000
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig
index 1d3d598..8dbe7cb 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/nsh/defconfig
@@ -56,7 +56,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_SPLIT=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig
index 955972a..ef33278 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/slip-httpd/defconfig
@@ -36,7 +36,6 @@ CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
-CONFIG_NFILE_DESCRIPTORS=24
 CONFIG_NUNGET_CHARS=0
 CONFIG_NXFLAT=y
 CONFIG_PIPES=y
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig
index f5f82ea..7aebd66 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/defconfig
@@ -41,7 +41,6 @@ CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
-CONFIG_NFILE_DESCRIPTORS=24
 CONFIG_NUNGET_CHARS=0
 CONFIG_PIPES=y
 CONFIG_RAM_SIZE=32768
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig
index cd81cda..4ec3112 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/defconfig
@@ -38,7 +38,6 @@ CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
-CONFIG_NFILE_DESCRIPTORS=24
 CONFIG_NUNGET_CHARS=0
 CONFIG_NXFLAT=y
 CONFIG_PIPES=y
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig
index cd1606f..fe40425 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbmsc/defconfig
@@ -28,7 +28,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPICLOCK=12500000
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=32768
 CONFIG_RAM_START=0x10000000
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig
index e216b04..b3d345a 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/usbserial/defconfig
@@ -24,7 +24,6 @@ CONFIG_LPC17_40_USBDEV=y
 CONFIG_LPC17_40_USBDEV_NDMADESCRIPTORS=0
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PL2303=y
 CONFIG_PL2303_EPBULKIN=5
 CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig
index b00df22..b465a27 100644
--- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig
+++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/zmodem/defconfig
@@ -53,7 +53,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_SPLIT=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig
index 23ac762..31f42a2 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/fb/defconfig
@@ -31,7 +31,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NX=y
 CONFIG_NXFONT_SANS23X27=y
 CONFIG_NXFONT_SANS28X37B=y
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig
index 9b5c978..47fc9d2 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/defconfig
@@ -36,7 +36,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_LOSETUP=y
 CONFIG_NSH_DISABLE_MKRD=y
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig
index f6e986c..17b61e7 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/defconfig
@@ -40,7 +40,6 @@ CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MM_REGIONS=3
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_DISABLE_IFCONFIG=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_DISABLE_PS=y
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig
index 7389cda..0f8238f 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/nsh/defconfig
@@ -33,7 +33,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig
index 6f3865f..e2e4b56 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/nxlines/defconfig
@@ -35,7 +35,6 @@ CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MM_REGIONS=3
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NX=y
 CONFIG_NXFONT_SANS23X27=y
 CONFIG_NXFONT_SANS28X37B=y
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig
index 0e089f4..84ab98f 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/pdcurses/defconfig
@@ -42,7 +42,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig b/boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig
index 4be98d7..d334ef8 100644
--- a/boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig
+++ b/boards/arm/lpc17xx_40xx/open1788/configs/pwfb/defconfig
@@ -41,7 +41,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MM_REGIONS=3
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig
index 849c3e3..7427d73 100644
--- a/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/u-blox-c027/configs/nsh/defconfig
@@ -80,7 +80,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig
index 2b6926e..244b1d3 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/hello/defconfig
@@ -36,7 +36,6 @@ CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
-CONFIG_NFILE_DESCRIPTORS=24
 CONFIG_NUNGET_CHARS=0
 CONFIG_NXFLAT=y
 CONFIG_RAM_SIZE=32768
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig
index 9a2f539..dffa92f 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nsh/defconfig
@@ -56,7 +56,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_SPLIT=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig
index 9d668b5..da5de23 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/nxhello/defconfig
@@ -64,7 +64,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_SPLIT=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
diff --git a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig
index 7fdc533..3f57185 100644
--- a/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig
+++ b/boards/arm/lpc17xx_40xx/zkit-arm-1769/configs/thttpd/defconfig
@@ -41,7 +41,6 @@ CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
-CONFIG_NFILE_DESCRIPTORS=24
 CONFIG_NUNGET_CHARS=0
 CONFIG_NXFLAT=y
 CONFIG_PIPES=y
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig
index 5f16e91..9da1e9c 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig
+++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/composite/defconfig
@@ -34,7 +34,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=32768
 CONFIG_RAM_START=0x40000000
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig
index 2ebeaa5..306d105 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig
+++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/nsh/defconfig
@@ -23,7 +23,6 @@ CONFIG_FS_FAT=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig
index 3cef359..5a70091 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig
+++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbmsc/defconfig
@@ -21,7 +21,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=32768
 CONFIG_RAM_START=0x40000000
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig
index 4ff1dd2..58d3fc6 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig
+++ b/boards/arm/lpc214x/mcu123-lpc214x/configs/usbserial/defconfig
@@ -20,7 +20,6 @@ CONFIG_EXAMPLES_USBSERIAL=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PL2303=y
 CONFIG_PL2303_EPBULKIN=5
 CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
diff --git a/boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig b/boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig
index 6e731c5..51eb43c 100644
--- a/boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig
+++ b/boards/arm/lpc214x/zp214xpa/configs/nsh/defconfig
@@ -17,7 +17,6 @@ CONFIG_ARCH_STACKDUMP=y
 CONFIG_BOARD_LOOPSPERMSEC=3270
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig b/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig
index 337abc3..9f49010 100644
--- a/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig
+++ b/boards/arm/lpc214x/zp214xpa/configs/nxlines/defconfig
@@ -30,7 +30,6 @@ CONFIG_LCD_MAXCONTRAST=255
 CONFIG_LCD_UG2864AMBAG01=y
 CONFIG_MAX_TASKS=16
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NX=y
 CONFIG_NXFONT_MONO5X8=y
 CONFIG_NXSTART_EXTERNINIT=y
diff --git a/boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig b/boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig
index b9a5301..e2e6a92 100644
--- a/boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig
+++ b/boards/arm/lpc2378/olimex-lpc2378/configs/nsh/defconfig
@@ -18,7 +18,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_LPC2378_UART0=y
 CONFIG_LPC2378_UART2=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/lpc31xx/ea3131/configs/nsh/defconfig b/boards/arm/lpc31xx/ea3131/configs/nsh/defconfig
index 5a97af5..d5c0e61 100644
--- a/boards/arm/lpc31xx/ea3131/configs/nsh/defconfig
+++ b/boards/arm/lpc31xx/ea3131/configs/nsh/defconfig
@@ -24,7 +24,6 @@ CONFIG_FS_FAT=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_LPC31_UART=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig b/boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig
index 4fc3729..b29e703 100644
--- a/boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig
+++ b/boards/arm/lpc31xx/ea3131/configs/pgnsh/defconfig
@@ -28,7 +28,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MTD=y
 CONFIG_MTD_M25P=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig b/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig
index face713..0bb5da0 100644
--- a/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig
+++ b/boards/arm/lpc31xx/ea3131/configs/usbserial/defconfig
@@ -24,7 +24,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_LPC31_UART=y
 CONFIG_LPC31_USBOTG=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PL2303=y
 CONFIG_PL2303_EPBULKIN=1
 CONFIG_PL2303_EPINTIN=3
diff --git a/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig b/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig
index 4fe797a..fb174d5 100644
--- a/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig
+++ b/boards/arm/lpc31xx/ea3152/configs/ostest/defconfig
@@ -23,7 +23,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_LPC31_UART=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=196608
 CONFIG_RAM_START=0x11028000
diff --git a/boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig b/boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig
index 4d78197..12e3156 100644
--- a/boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig
+++ b/boards/arm/lpc31xx/olimex-lpc-h3131/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_IDLETHREAD_STACKSIZE=768
 CONFIG_LPC31_UART=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig
index 60bec36..153c525 100644
--- a/boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig
+++ b/boards/arm/lpc43xx/bambino-200e/configs/knsh/defconfig
@@ -31,7 +31,6 @@ CONFIG_LPC43_UART1=y
 CONFIG_LPC43_USB0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig
index 069481f..6bff204 100644
--- a/boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig
+++ b/boards/arm/lpc43xx/bambino-200e/configs/max31855/defconfig
@@ -34,7 +34,6 @@ CONFIG_LPC43_UART1=y
 CONFIG_LPC43_USB0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig
index d9557dc..4fb7252 100644
--- a/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig
+++ b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/defconfig
@@ -62,7 +62,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig
index 7c5202b..8057bca 100644
--- a/boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig
+++ b/boards/arm/lpc43xx/bambino-200e/configs/nsh/defconfig
@@ -30,7 +30,6 @@ CONFIG_LPC43_UART1=y
 CONFIG_LPC43_USB0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig b/boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig
index afd426a..d76a81d 100644
--- a/boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig
+++ b/boards/arm/lpc43xx/bambino-200e/configs/usbnsh/defconfig
@@ -28,7 +28,6 @@ CONFIG_LPC43_UART1=y
 CONFIG_LPC43_USB0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig
index c95bc52..f49c7a7 100644
--- a/boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig
+++ b/boards/arm/lpc43xx/lpc4330-xplorer/configs/nsh/defconfig
@@ -24,7 +24,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_LPC43_USART0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig
index 4ef1cab..924ac02 100644
--- a/boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig
+++ b/boards/arm/lpc43xx/lpc4337-ws/configs/nsh/defconfig
@@ -44,7 +44,6 @@ CONFIG_LPC43_USART2=y
 CONFIG_LPC43_USB0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig
index dee4633..102db87 100644
--- a/boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig
+++ b/boards/arm/lpc43xx/lpc4357-evb/configs/nsh/defconfig
@@ -24,7 +24,6 @@ CONFIG_LPC43_BOOT_FLASHA=y
 CONFIG_LPC43_USART0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig b/boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig
index 6a91e73..3f44e2e 100644
--- a/boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig
+++ b/boards/arm/lpc43xx/lpc4370-link2/configs/nsh/defconfig
@@ -41,7 +41,6 @@ CONFIG_LPC43_USART2=y
 CONFIG_LPC43_USB0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig
index 6fafa3c..9a76023 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/fb/defconfig
@@ -50,7 +50,6 @@ CONFIG_LPC54_LCD_VRAMBASE=0xa0000000
 CONFIG_LPC54_USART0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig
index 26931cf..312df6d 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/lvgl/defconfig
@@ -50,7 +50,6 @@ CONFIG_LV_HOR_RES=480
 CONFIG_LV_VER_RES=272
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=163840
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig
index ff263d1..53dde4e 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/netnsh/defconfig
@@ -48,7 +48,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig
index 77e78c8..2a6d931 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nsh/defconfig
@@ -36,7 +36,6 @@ CONFIG_LPC54_I2C2_MASTER=y
 CONFIG_LPC54_RTC=y
 CONFIG_LPC54_USART0=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig
index f2de95e..a7de1a7 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/nxwm/defconfig
@@ -50,7 +50,6 @@ CONFIG_LPC54_USART0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig
index 2770c3e..7b77885 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwfb/defconfig
@@ -50,7 +50,6 @@ CONFIG_LPC54_USART0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NX=y
 CONFIG_NXFONT_SANS23X27=y
 CONFIG_NXTK_BORDERCOLOR1=0xad55
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig
index 496bf87..c1b124a 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/pwlines/defconfig
@@ -41,7 +41,6 @@ CONFIG_LPC54_USART0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NX=y
 CONFIG_NXFONT_SANS23X27=y
 CONFIG_NXTK_BORDERCOLOR1=0xad55
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig
index 8ad6987..62a8a2d 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx1/defconfig
@@ -51,7 +51,6 @@ CONFIG_LPC54_USART0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig
index 9fdc007..b10028e 100644
--- a/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig
+++ b/boards/arm/lpc54xx/lpcxpresso-lpc54628/configs/twm4nx2/defconfig
@@ -51,7 +51,6 @@ CONFIG_LPC54_USART0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/max326xx/max32660-evsys/configs/nsh/defconfig b/boards/arm/max326xx/max32660-evsys/configs/nsh/defconfig
index 2d0709f..7eefddc 100644
--- a/boards/arm/max326xx/max32660-evsys/configs/nsh/defconfig
+++ b/boards/arm/max326xx/max32660-evsys/configs/nsh/defconfig
@@ -23,7 +23,6 @@ CONFIG_FS_PROCFS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX326XX_UART1=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/moxart/moxa/configs/nsh/defconfig b/boards/arm/moxart/moxa/configs/nsh/defconfig
index fd1a121..6807079 100644
--- a/boards/arm/moxart/moxa/configs/nsh/defconfig
+++ b/boards/arm/moxart/moxa/configs/nsh/defconfig
@@ -73,7 +73,6 @@ CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_LINELEN=80
 CONFIG_NSH_LOGIN_PASSWORD="nuttx"
diff --git a/boards/arm/nrf52/nrf52-feather/configs/i2c/defconfig b/boards/arm/nrf52/nrf52-feather/configs/i2c/defconfig
index 6caaead..bff6f9d 100644
--- a/boards/arm/nrf52/nrf52-feather/configs/i2c/defconfig
+++ b/boards/arm/nrf52/nrf52-feather/configs/i2c/defconfig
@@ -25,7 +25,6 @@ CONFIG_I2C=y
 CONFIG_I2C_POLLED=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NRF52_I2C0_MASTER=y
 CONFIG_NRF52_UART0=y
 CONFIG_NSH_ARCHINIT=y
diff --git a/boards/arm/nrf52/nrf52-feather/configs/nsh/defconfig b/boards/arm/nrf52/nrf52-feather/configs/nsh/defconfig
index 657011a..08ad25e 100644
--- a/boards/arm/nrf52/nrf52-feather/configs/nsh/defconfig
+++ b/boards/arm/nrf52/nrf52-feather/configs/nsh/defconfig
@@ -22,7 +22,6 @@ CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NRF52_UART0=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/nrf52/nrf52-feather/configs/userleds/defconfig b/boards/arm/nrf52/nrf52-feather/configs/userleds/defconfig
index 99e60c5..0fe646f 100644
--- a/boards/arm/nrf52/nrf52-feather/configs/userleds/defconfig
+++ b/boards/arm/nrf52/nrf52-feather/configs/userleds/defconfig
@@ -25,7 +25,6 @@ CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NRF52_UART0=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig b/boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig
index 78cad5e..84e6f59 100644
--- a/boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig
+++ b/boards/arm/nrf52/nrf52832-dk/configs/nsh/defconfig
@@ -22,7 +22,6 @@ CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NRF52_UART0=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig b/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig
index d5a83d1..1ceb3a7 100644
--- a/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig
+++ b/boards/arm/nrf52/nrf52832-dk/configs/wdog/defconfig
@@ -24,7 +24,6 @@ CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NRF52_UART0=y
 CONFIG_NRF52_WDT=y
 CONFIG_NSH_ARCHINIT=y
diff --git a/boards/arm/nrf52/nrf52832-mdk/configs/nsh/defconfig b/boards/arm/nrf52/nrf52832-mdk/configs/nsh/defconfig
index 6a4c3c8..d6c7968 100644
--- a/boards/arm/nrf52/nrf52832-mdk/configs/nsh/defconfig
+++ b/boards/arm/nrf52/nrf52832-mdk/configs/nsh/defconfig
@@ -22,7 +22,6 @@ CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NRF52_UART0=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/nrf52/nrf52832-mdk/configs/sdc/defconfig b/boards/arm/nrf52/nrf52832-mdk/configs/sdc/defconfig
index 77ec310..0bacbd5 100644
--- a/boards/arm/nrf52/nrf52832-mdk/configs/sdc/defconfig
+++ b/boards/arm/nrf52/nrf52832-mdk/configs/sdc/defconfig
@@ -40,7 +40,6 @@ CONFIG_NET=y
 CONFIG_NETDEV_LATEINIT=y
 CONFIG_NET_BLUETOOTH=y
 CONFIG_NET_BLUETOOTH_BACKLOG=0
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NIMBLE=y
 CONFIG_NIMBLE_REF="5fbb6660a433217b8eaf1b95de410379f868616c"
 CONFIG_NRF52_DCDC=y
diff --git a/boards/arm/nrf52/nrf52832-sparkfun/configs/nsh/defconfig b/boards/arm/nrf52/nrf52832-sparkfun/configs/nsh/defconfig
index 95e1dd5..859dcca 100644
--- a/boards/arm/nrf52/nrf52832-sparkfun/configs/nsh/defconfig
+++ b/boards/arm/nrf52/nrf52832-sparkfun/configs/nsh/defconfig
@@ -22,7 +22,6 @@ CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NRF52_UART0=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig
index 29df228..d45d619 100644
--- a/boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig
+++ b/boards/arm/nrf52/nrf52840-dk/configs/adc/defconfig
@@ -28,7 +28,6 @@ CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NRF52_SAADC=y
 CONFIG_NRF52_UART0=y
 CONFIG_NSH_ARCHINIT=y
diff --git a/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig
index 2064055..0a66506 100644
--- a/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig
+++ b/boards/arm/nrf52/nrf52840-dk/configs/highpri/defconfig
@@ -24,7 +24,6 @@ CONFIG_FS_FAT=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NRF52840DK_HIGHPRI=y
 CONFIG_NRF52_TIMER0=y
 CONFIG_NRF52_UART0=y
diff --git a/boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig
index 45a1f60..7e4f6bc 100644
--- a/boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig
+++ b/boards/arm/nrf52/nrf52840-dk/configs/nsh/defconfig
@@ -22,7 +22,6 @@ CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NRF52_UART0=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/nrf52/nrf52840-dk/configs/pwm/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/pwm/defconfig
index 1ac0246..823c243 100644
--- a/boards/arm/nrf52/nrf52840-dk/configs/pwm/defconfig
+++ b/boards/arm/nrf52/nrf52840-dk/configs/pwm/defconfig
@@ -24,7 +24,6 @@ CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NRF52_PWM0=y
 CONFIG_NRF52_PWM0_CH0=y
 CONFIG_NRF52_PWM0_CH1=y
diff --git a/boards/arm/nrf52/nrf52840-dk/configs/sx127x/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/sx127x/defconfig
index 9a723fe..edf3c6b 100644
--- a/boards/arm/nrf52/nrf52840-dk/configs/sx127x/defconfig
+++ b/boards/arm/nrf52/nrf52840-dk/configs/sx127x/defconfig
@@ -30,7 +30,6 @@ CONFIG_LPWAN_SX127X_RXSUPPORT=y
 CONFIG_LPWAN_SX127X_TXSUPPORT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NRF52_GPIOTE=y
 CONFIG_NRF52_SPI0_MASTER=y
 CONFIG_NRF52_UART0=y
diff --git a/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig b/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig
index 19f1681..f875e0a 100644
--- a/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig
+++ b/boards/arm/nrf52/nrf52840-dk/configs/timer/defconfig
@@ -24,7 +24,6 @@ CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NRF52_RTC0=y
 CONFIG_NRF52_TIMER0=y
 CONFIG_NRF52_UART0=y
diff --git a/boards/arm/nrf52/nrf52840-dongle/configs/nsh/defconfig b/boards/arm/nrf52/nrf52840-dongle/configs/nsh/defconfig
index ac8593d..a606af1 100644
--- a/boards/arm/nrf52/nrf52840-dongle/configs/nsh/defconfig
+++ b/boards/arm/nrf52/nrf52840-dongle/configs/nsh/defconfig
@@ -22,7 +22,6 @@ CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NRF52_UART0=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig b/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig
index 043a558..822d831 100644
--- a/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig
+++ b/boards/arm/nuc1xx/nutiny-nuc120/configs/nsh/defconfig
@@ -29,7 +29,7 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=8
 CONFIG_MM_SMALL=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
 CONFIG_NSH_DISABLE_MKDIR=y
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig
index e0761f7..ea72069 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/displaypack/defconfig
@@ -66,7 +66,7 @@ CONFIG_LCD_ST7789_YOFFSET=40
 CONFIG_LCD_ST7789_YRES=240
 CONFIG_MAX_TASKS=8
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig
index b90c2bb..49f4ac5 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/enc28j60/defconfig
@@ -51,7 +51,7 @@ CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig
index ebf9966..7663e37 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/nsh/defconfig
@@ -31,7 +31,7 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig
index 15cf243..bd1b9f9 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/nshsram/defconfig
@@ -31,7 +31,7 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig
index 0c758a7..14a62de 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/smp/defconfig
@@ -31,7 +31,7 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig
index bc73733..e2edd74 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/spisd/defconfig
@@ -38,7 +38,7 @@ CONFIG_FS_PROCFS=y
 CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_MAX_TASKS=8
 CONFIG_MMCSD=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig b/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig
index 98c72ab..4656914 100644
--- a/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig
+++ b/boards/arm/rp2040/raspberrypi-pico/configs/ssd1306/defconfig
@@ -49,7 +49,7 @@ CONFIG_LCD_SH1106_OLED_132=y
 CONFIG_LCD_SSD1306_I2C=y
 CONFIG_MAX_TASKS=8
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/configs/nsh/defconfig b/boards/arm/s32k1xx/rddrone-uavcan144/configs/nsh/defconfig
index 5523c87..01c9bc2 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan144/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/rddrone-uavcan144/configs/nsh/defconfig
@@ -36,7 +36,6 @@ CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_LPUART1_TXBUFSIZE=64
 CONFIG_MAX_TASKS=16
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/s32k1xx/rddrone-uavcan144/configs/nshdebug/defconfig b/boards/arm/s32k1xx/rddrone-uavcan144/configs/nshdebug/defconfig
index c33ed01..ad62104 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan144/configs/nshdebug/defconfig
+++ b/boards/arm/s32k1xx/rddrone-uavcan144/configs/nshdebug/defconfig
@@ -38,7 +38,6 @@ CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_LPUART1_TXBUFSIZE=64
 CONFIG_MAX_TASKS=16
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig b/boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig
index 3b62f48..38661bb 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig
@@ -43,7 +43,6 @@ CONFIG_NETDEV_IFINDEX=y
 CONFIG_NET_CAN=y
 CONFIG_NET_CAN_SOCK_OPTS=y
 CONFIG_NET_TIMESTAMP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig b/boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig
index abc095f..081af73 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig
+++ b/boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig
@@ -38,7 +38,6 @@ CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_LPUART1_TXBUFSIZE=64
 CONFIG_MAX_TASKS=16
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig
index 192b90f..f226a1a 100644
--- a/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/s32k118evb/configs/nsh/defconfig
@@ -30,7 +30,7 @@ CONFIG_LPUART0_TXBUFSIZE=64
 CONFIG_MAX_TASKS=8
 CONFIG_MM_SMALL=y
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
diff --git a/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig
index 5ba10f4..4650d66 100644
--- a/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/s32k144evb/configs/nsh/defconfig
@@ -28,7 +28,6 @@ CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_LPUART1_TXBUFSIZE=64
 CONFIG_MAX_TASKS=16
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig
index 44eeada..e5f85fa 100644
--- a/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/s32k146evb/configs/nsh/defconfig
@@ -28,7 +28,6 @@ CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_LPUART1_TXBUFSIZE=64
 CONFIG_MAX_TASKS=16
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig b/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig
index a59bd57..c8f7cc5 100644
--- a/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/s32k148evb/configs/nsh/defconfig
@@ -28,7 +28,6 @@ CONFIG_LPUART1_SERIAL_CONSOLE=y
 CONFIG_LPUART1_TXBUFSIZE=64
 CONFIG_MAX_TASKS=16
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sam34/arduino-due/configs/nsh/defconfig b/boards/arm/sam34/arduino-due/configs/nsh/defconfig
index c5ff602..dce28a5 100644
--- a/boards/arm/sam34/arduino-due/configs/nsh/defconfig
+++ b/boards/arm/sam34/arduino-due/configs/nsh/defconfig
@@ -23,7 +23,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig b/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig
index bfe5abf..5470097 100644
--- a/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig
+++ b/boards/arm/sam34/flipnclick-sam3x/configs/nsh/defconfig
@@ -23,7 +23,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig b/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig
index ec26c77..127c0f3 100644
--- a/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig
+++ b/boards/arm/sam34/flipnclick-sam3x/configs/nxlines/defconfig
@@ -34,7 +34,6 @@ CONFIG_LCD_MAXCONTRAST=255
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig b/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig
index 0244b12..8f5fae0 100644
--- a/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig
+++ b/boards/arm/sam34/sam3u-ek/configs/knsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_FS_FAT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_LOSETUP=y
 CONFIG_NSH_DISABLE_MKRD=y
diff --git a/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig b/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig
index 1b90121..bb64029 100644
--- a/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig
+++ b/boards/arm/sam34/sam3u-ek/configs/nsh/defconfig
@@ -24,7 +24,6 @@ CONFIG_BUILTIN=y
 CONFIG_FS_FAT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sam34/sam3u-ek/configs/nx/defconfig b/boards/arm/sam34/sam3u-ek/configs/nx/defconfig
index f2ed96b..0d1bf39 100644
--- a/boards/arm/sam34/sam3u-ek/configs/nx/defconfig
+++ b/boards/arm/sam34/sam3u-ek/configs/nx/defconfig
@@ -41,7 +41,6 @@ CONFIG_LCD_PORTRAIT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=12
 CONFIG_NX=y
 CONFIG_NXFONT_SANS23X27=y
 CONFIG_NX_BLOCKING=y
diff --git a/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig b/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig
index afc40f6..33903bf 100644
--- a/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig
+++ b/boards/arm/sam34/sam3u-ek/configs/nxwm/defconfig
@@ -37,7 +37,6 @@ CONFIG_LCD_MAXPOWER=31
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=12
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
diff --git a/boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig b/boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig
index 23a274f..f28c8c4 100644
--- a/boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig
+++ b/boards/arm/sam34/sam4cmp-db/configs/nsh/defconfig
@@ -18,7 +18,6 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DISABLE_ENVIRON=y
 CONFIG_FS_PROCFS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/sam34/sam4e-ek/configs/nsh/defconfig b/boards/arm/sam34/sam4e-ek/configs/nsh/defconfig
index f5529ad..cabf9e7 100644
--- a/boards/arm/sam34/sam4e-ek/configs/nsh/defconfig
+++ b/boards/arm/sam34/sam4e-ek/configs/nsh/defconfig
@@ -47,7 +47,6 @@ CONFIG_NET_TCP_CONNS=16
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig b/boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig
index 24745cc..6821a7b 100644
--- a/boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig
+++ b/boards/arm/sam34/sam4e-ek/configs/nxwm/defconfig
@@ -62,7 +62,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sam34/sam4e-ek/configs/usbnsh/defconfig b/boards/arm/sam34/sam4e-ek/configs/usbnsh/defconfig
index 7cf4090..826fa0e 100644
--- a/boards/arm/sam34/sam4e-ek/configs/usbnsh/defconfig
+++ b/boards/arm/sam34/sam4e-ek/configs/usbnsh/defconfig
@@ -54,7 +54,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig b/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig
index ce63a8e..347e824 100644
--- a/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig
+++ b/boards/arm/sam34/sam4l-xplained/configs/nsh/defconfig
@@ -25,7 +25,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig b/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig
index 96ffb79..580d015 100644
--- a/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig
+++ b/boards/arm/sam34/sam4s-xplained/configs/nsh/defconfig
@@ -26,7 +26,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/sama5/giant-board/configs/netnsh/defconfig b/boards/arm/sama5/giant-board/configs/netnsh/defconfig
index d97f148..e2abc3f 100644
--- a/boards/arm/sama5/giant-board/configs/netnsh/defconfig
+++ b/boards/arm/sama5/giant-board/configs/netnsh/defconfig
@@ -63,7 +63,6 @@ CONFIG_NET_TCP_KEEPALIVE=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_WRITE_BUFFERS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sama5/giant-board/configs/nsh/defconfig b/boards/arm/sama5/giant-board/configs/nsh/defconfig
index facaec1..138bfb5 100644
--- a/boards/arm/sama5/giant-board/configs/nsh/defconfig
+++ b/boards/arm/sama5/giant-board/configs/nsh/defconfig
@@ -35,7 +35,6 @@ CONFIG_HIDKBD_POLLUSEC=80000
 CONFIG_I2S=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sama5/giant-board/configs/sdmmc-net-nsh/defconfig b/boards/arm/sama5/giant-board/configs/sdmmc-net-nsh/defconfig
index cc9fc3f..57e6db4 100644
--- a/boards/arm/sama5/giant-board/configs/sdmmc-net-nsh/defconfig
+++ b/boards/arm/sama5/giant-board/configs/sdmmc-net-nsh/defconfig
@@ -76,7 +76,6 @@ CONFIG_NET_TCP_KEEPALIVE=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_WRITE_BUFFERS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sama5/giant-board/configs/sdmmcnsh/defconfig b/boards/arm/sama5/giant-board/configs/sdmmcnsh/defconfig
index 3f8e0ec..fbe88c8 100644
--- a/boards/arm/sama5/giant-board/configs/sdmmcnsh/defconfig
+++ b/boards/arm/sama5/giant-board/configs/sdmmcnsh/defconfig
@@ -70,7 +70,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_NOTIFIER=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig b/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig
index 6d7020e..d224b5e 100644
--- a/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig
+++ b/boards/arm/sama5/sama5d2-xult/configs/netnsh/defconfig
@@ -65,7 +65,6 @@ CONFIG_NET_TCP_KEEPALIVE=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_WRITE_BUFFERS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig b/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig
index 3ccdc26..8c31968 100644
--- a/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig
+++ b/boards/arm/sama5/sama5d2-xult/configs/nsh/defconfig
@@ -37,7 +37,6 @@ CONFIG_HIDKBD_POLLUSEC=80000
 CONFIG_I2S=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig b/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig
index 35ea6ab..bd15fe7 100644
--- a/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig
+++ b/boards/arm/sama5/sama5d2-xult/configs/sdmmcnsh/defconfig
@@ -72,7 +72,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_NOTIFIER=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sama5/sama5d3-xplained/configs/bridge/defconfig b/boards/arm/sama5/sama5d3-xplained/configs/bridge/defconfig
index c42af67..2904dce 100644
--- a/boards/arm/sama5/sama5d3-xplained/configs/bridge/defconfig
+++ b/boards/arm/sama5/sama5d3-xplained/configs/bridge/defconfig
@@ -43,7 +43,6 @@ CONFIG_NET_ICMP=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CONNS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=268435456
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig b/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig
index 8b65eb0..befe609 100644
--- a/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig
+++ b/boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig
@@ -65,7 +65,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_NOTIFIER=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig b/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig
index fe9b158..06b7637 100644
--- a/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig
+++ b/boards/arm/sama5/sama5d3-xplained/configs/nsh/defconfig
@@ -32,7 +32,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig
index 8f3134f..85ab03e 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/demo/defconfig
@@ -39,7 +39,6 @@ CONFIG_MMCSD_SDIO=y
 CONFIG_MM_REGIONS=2
 CONFIG_MTD=y
 CONFIG_MTD_AT25=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig
index 3fbbad9..d68a4b2 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/hello/defconfig
@@ -23,7 +23,6 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
 CONFIG_RAM_START=0x00300000
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig
index 20c5660..61d239f 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/norboot/defconfig
@@ -23,7 +23,6 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
 CONFIG_RAM_START=0x00300000
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig
index eb0a0c0..ce9285e 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/nsh/defconfig
@@ -33,7 +33,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig
index 4d522d6..1c2a8c7 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/nx/defconfig
@@ -32,7 +32,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NX=y
 CONFIG_NXFONT_SERIF22X28B=y
 CONFIG_NXTK_BORDERWIDTH=3
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig
index 8cb1002..3ee1f5d 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/nxplayer/defconfig
@@ -44,7 +44,6 @@ CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/nxwm/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/nxwm/defconfig
index 615768f..a8e42f5 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/nxwm/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/nxwm/defconfig
@@ -33,7 +33,6 @@ CONFIG_LIBM=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
diff --git a/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig b/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig
index aeb4b64..df1d58f 100644
--- a/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig
+++ b/boards/arm/sama5/sama5d3x-ek/configs/ov2640/defconfig
@@ -27,7 +27,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
 CONFIG_RAM_START=0x00304000
diff --git a/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig b/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig
index d210fd3..a8dcaa4 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/at25boot/defconfig
@@ -30,7 +30,6 @@ CONFIG_LIB_HEX2BIN=y
 CONFIG_MAX_TASKS=16
 CONFIG_MTD=y
 CONFIG_MTD_AT25=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
 CONFIG_RAM_START=0x00200000
diff --git a/boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig b/boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig
index 0447b64..3904b76 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/bridge/defconfig
@@ -41,7 +41,6 @@ CONFIG_NET_ICMP=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CONNS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=268435456
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig b/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig
index 4157777..b5f24ce 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/dramboot/defconfig
@@ -28,7 +28,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIB_HEX2BIN=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
 CONFIG_RAM_START=0x00200000
diff --git a/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig b/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig
index 77cba9a..e47e920 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/elf/defconfig
@@ -50,7 +50,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIB_SYSCALL=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_PGALLOC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=268435456
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig b/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig
index 54f6d21..5668b83 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig
@@ -73,7 +73,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig b/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig
index 4642db4..c5f7f32 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/knsh/defconfig
@@ -53,7 +53,6 @@ CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MM_PGALLOC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig b/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig
index bbedd32..cc32603 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig
@@ -75,7 +75,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig b/boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig
index ce56aa3..352c82e 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig
@@ -77,7 +77,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig
index 72d8742..f65c593 100644
--- a/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig
+++ b/boards/arm/sama5/sama5d4-ek/configs/ramtest/defconfig
@@ -30,7 +30,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLEBG=y
 CONFIG_NSH_DISABLESCRIPT=y
diff --git a/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig b/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig
index fa2fffd..b41092e 100644
--- a/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig
+++ b/boards/arm/samd2l2/arduino-m0/configs/nsh/defconfig
@@ -37,7 +37,6 @@ CONFIG_DEFAULT_SMALL=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_DEFAULT=1536
diff --git a/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig b/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig
index 59bd437..28eacdd 100644
--- a/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig
+++ b/boards/arm/samd2l2/arduino-m0/configs/usbnsh/defconfig
@@ -40,7 +40,6 @@ CONFIG_DEFAULT_SMALL=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_DEFAULT=1536
diff --git a/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig
index e350e34..0aa8638 100644
--- a/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig
+++ b/boards/arm/samd2l2/samd20-xplained/configs/nsh/defconfig
@@ -39,7 +39,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_DEFAULT=1536
diff --git a/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig
index eb9b5e6..b8e3472 100644
--- a/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig
+++ b/boards/arm/samd2l2/samd21-xplained/configs/nsh/defconfig
@@ -40,7 +40,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_DEFAULT=1536
diff --git a/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig b/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig
index 78c5de6..9be44bc 100644
--- a/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig
+++ b/boards/arm/samd2l2/saml21-xplained/configs/nsh/defconfig
@@ -40,7 +40,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_DEFAULT=1536
diff --git a/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig b/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig
index 9ded787..12eb6a3 100644
--- a/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig
+++ b/boards/arm/samd5e5/metro-m4/configs/nsh/defconfig
@@ -20,7 +20,6 @@ CONFIG_DISABLE_ENVIRON=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig b/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig
index fbfc1c2..761f4e7 100644
--- a/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig
+++ b/boards/arm/samd5e5/same54-xplained-pro/configs/nsh/defconfig
@@ -20,7 +20,6 @@ CONFIG_DISABLE_ENVIRON=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig b/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig
index 18f4c43..13d6e05 100644
--- a/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/mrf24j40-starhub/defconfig
@@ -80,7 +80,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
diff --git a/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig b/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig
index 27a4ef3..4b94779 100644
--- a/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/netnsh/defconfig
@@ -67,7 +67,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/samv7/same70-xplained/configs/nsh/defconfig b/boards/arm/samv7/same70-xplained/configs/nsh/defconfig
index 1116f04..aed26ed 100644
--- a/boards/arm/samv7/same70-xplained/configs/nsh/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/nsh/defconfig
@@ -46,7 +46,6 @@ CONFIG_MTD=y
 CONFIG_MTD_AT24XX=y
 CONFIG_MTD_AT25=y
 CONFIG_MTD_CONFIG=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig b/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig
index 779c2a8..df2f9c6 100644
--- a/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig
+++ b/boards/arm/samv7/same70-xplained/configs/twm4nx/defconfig
@@ -68,7 +68,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NX=y
 CONFIG_NXFONT_SANS22X29B=y
 CONFIG_NXFONT_SANS23X27=y
diff --git a/boards/arm/samv7/samv71-xult/configs/knsh/defconfig b/boards/arm/samv7/samv71-xult/configs/knsh/defconfig
index de28299..a5d351f 100644
--- a/boards/arm/samv7/samv71-xult/configs/knsh/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/knsh/defconfig
@@ -48,7 +48,6 @@ CONFIG_MTD=y
 CONFIG_MTD_AT24XX=y
 CONFIG_MTD_AT25=y
 CONFIG_MTD_CONFIG=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_MKRD=y
diff --git a/boards/arm/samv7/samv71-xult/configs/module/defconfig b/boards/arm/samv7/samv71-xult/configs/module/defconfig
index 61ba111..5381087 100644
--- a/boards/arm/samv7/samv71-xult/configs/module/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/module/defconfig
@@ -37,7 +37,6 @@ CONFIG_FS_ROMFS=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_MAX_TASKS=16
 CONFIG_MODULE=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
index d9b4ccf..5a61629 100644
--- a/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mrf24j40-starhub/defconfig
@@ -83,7 +83,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
diff --git a/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig b/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig
index 7f57212..bccfd3b 100644
--- a/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/mxtxplnd/defconfig
@@ -54,7 +54,6 @@ CONFIG_MTD=y
 CONFIG_MTD_AT24XX=y
 CONFIG_MTD_AT25=y
 CONFIG_MTD_CONFIG=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig b/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig
index 2245282..d8032ae 100644
--- a/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/netnsh/defconfig
@@ -66,7 +66,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/samv7/samv71-xult/configs/nsh/defconfig b/boards/arm/samv7/samv71-xult/configs/nsh/defconfig
index 0a01449..5ea7fb95 100644
--- a/boards/arm/samv7/samv71-xult/configs/nsh/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/nsh/defconfig
@@ -47,7 +47,6 @@ CONFIG_MTD=y
 CONFIG_MTD_AT24XX=y
 CONFIG_MTD_AT25=y
 CONFIG_MTD_CONFIG=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig b/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig
index 9e3c22a..7054ce2 100644
--- a/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/nxwm/defconfig
@@ -57,7 +57,6 @@ CONFIG_MTD=y
 CONFIG_MTD_AT24XX=y
 CONFIG_MTD_AT25=y
 CONFIG_MTD_CONFIG=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/samv7/samv71-xult/configs/vnc/defconfig b/boards/arm/samv7/samv71-xult/configs/vnc/defconfig
index b2339f9..ac75a96 100644
--- a/boards/arm/samv7/samv71-xult/configs/vnc/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/vnc/defconfig
@@ -68,7 +68,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig b/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig
index 147a7ac..b77110d 100644
--- a/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig
+++ b/boards/arm/samv7/samv71-xult/configs/vnxwm/defconfig
@@ -70,7 +70,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/b-g474e-dpow1/configs/nsh/defconfig b/boards/arm/stm32/b-g474e-dpow1/configs/nsh/defconfig
index 99e2563..6fedb59 100644
--- a/boards/arm/stm32/b-g474e-dpow1/configs/nsh/defconfig
+++ b/boards/arm/stm32/b-g474e-dpow1/configs/nsh/defconfig
@@ -26,7 +26,6 @@ CONFIG_DEBUG_SYMBOLS=y
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBM=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig
index 470a56a..4bf0db3 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/knsh/defconfig
@@ -24,7 +24,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_GET=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig
index 0bf85fe..6e140c1 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-6lowpan/defconfig
@@ -79,7 +79,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig
index a635e9f..424f463 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-mac/defconfig
@@ -29,7 +29,6 @@ CONFIG_IEEE802154_MACDEV=y
 CONFIG_IEEE802154_MRF24J40=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig
index 3228fc8..15def9b 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starhub/defconfig
@@ -64,7 +64,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
diff --git a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig
index aa6f008..8ceb1d1 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/mrf24j40-starpoint/defconfig
@@ -81,7 +81,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
diff --git a/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig
index fc3ea70..290b1ca 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/nsh/defconfig
@@ -22,7 +22,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig b/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig
index dc8c095..ce7dceb 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/usbnsh/defconfig
@@ -31,7 +31,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
diff --git a/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig b/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig
index aa9c182..0189677 100644
--- a/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig
+++ b/boards/arm/stm32/clicker2-stm32/configs/xbee-6lowpan/defconfig
@@ -75,7 +75,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
diff --git a/boards/arm/stm32/cloudctrl/configs/nsh/defconfig b/boards/arm/stm32/cloudctrl/configs/nsh/defconfig
index 3185b96..0324f04 100644
--- a/boards/arm/stm32/cloudctrl/configs/nsh/defconfig
+++ b/boards/arm/stm32/cloudctrl/configs/nsh/defconfig
@@ -43,7 +43,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig b/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig
index a410090..e962275 100644
--- a/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig
+++ b/boards/arm/stm32/fire-stm32v2/configs/nsh/defconfig
@@ -50,7 +50,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=16
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=24
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig b/boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig
index 012fd80..1eb6316 100644
--- a/boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig
+++ b/boards/arm/stm32/hymini-stm32v/configs/nsh/defconfig
@@ -23,7 +23,6 @@ CONFIG_FS_FAT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_READLINE=y
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig b/boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig
index 5239684..3518cf3 100644
--- a/boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig
+++ b/boards/arm/stm32/hymini-stm32v/configs/nsh2/defconfig
@@ -45,7 +45,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig
index c58aa74..9c98845 100644
--- a/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig
+++ b/boards/arm/stm32/hymini-stm32v/configs/usbmsc/defconfig
@@ -19,7 +19,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=49152
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig
index 383bccd..5550968 100644
--- a/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/hymini-stm32v/configs/usbnsh/defconfig
@@ -24,7 +24,6 @@ CONFIG_CDCACM_CONSOLE=y
 CONFIG_CDCACM_RXBUFSIZE=256
 CONFIG_CDCACM_TXBUFSIZE=256
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_READLINE=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=49152
diff --git a/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig b/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig
index f3ddf8d..6cf7722 100644
--- a/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig
+++ b/boards/arm/stm32/hymini-stm32v/configs/usbserial/defconfig
@@ -17,7 +17,6 @@ CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_EXAMPLES_USBSERIAL=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PL2303=y
 CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
 CONFIG_PL2303_RXBUFSIZE=512
diff --git a/boards/arm/stm32/maple/configs/nsh/defconfig b/boards/arm/stm32/maple/configs/nsh/defconfig
index 107999a..2a4c65d 100644
--- a/boards/arm/stm32/maple/configs/nsh/defconfig
+++ b/boards/arm/stm32/maple/configs/nsh/defconfig
@@ -33,7 +33,6 @@ CONFIG_BUILTIN=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_LIB_RAND_ORDER=2
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_LINELEN=80
diff --git a/boards/arm/stm32/maple/configs/nx/defconfig b/boards/arm/stm32/maple/configs/nx/defconfig
index 22b92ba..ce00982 100644
--- a/boards/arm/stm32/maple/configs/nx/defconfig
+++ b/boards/arm/stm32/maple/configs/nx/defconfig
@@ -47,7 +47,6 @@ CONFIG_LCD_SHARP_MEMLCD=y
 CONFIG_LIB_RAND_ORDER=2
 CONFIG_MAX_TASKS=16
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_LINELEN=80
diff --git a/boards/arm/stm32/maple/configs/usbnsh/defconfig b/boards/arm/stm32/maple/configs/usbnsh/defconfig
index 46dde3a..4913c91 100644
--- a/boards/arm/stm32/maple/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/maple/configs/usbnsh/defconfig
@@ -39,7 +39,6 @@ CONFIG_DEFAULT_SMALL=y
 CONFIG_I2C=y
 CONFIG_LIB_RAND_ORDER=2
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_LINELEN=80
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig
index 49e1e29..21b33f6 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig
@@ -66,7 +66,6 @@ CONFIG_MTD_CONFIG=y
 CONFIG_MTD_CONFIG_ERASEDVALUE=0xFF
 CONFIG_MTD_PARTITION=y
 CONFIG_MTD_SMART_SECTOR_SIZE=512
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig
index 1424ba4..c23192d 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/kostest/defconfig
@@ -47,7 +47,6 @@ CONFIG_MMCSD=y
 CONFIG_MM_REGIONS=2
 CONFIG_MTD_PARTITION=y
 CONFIG_MTD_SMART_SECTOR_SIZE=512
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig
index d339279..1ca8f87 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/nsh/defconfig
@@ -42,7 +42,6 @@ CONFIG_MMCSD=y
 CONFIG_MM_REGIONS=2
 CONFIG_MTD_PARTITION=y
 CONFIG_MTD_SMART_SECTOR_SIZE=512
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig
index dd877c4..71e627e 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/nx/defconfig
@@ -37,7 +37,6 @@ CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig
index cff3195..1780e46 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/nxlines/defconfig
@@ -42,7 +42,6 @@ CONFIG_LCD_NOGETRUN=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig
index c523d16..4e22eac 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/nxtext/defconfig
@@ -36,7 +36,6 @@ CONFIG_LCD_MIO283QT2=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig b/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig
index 6157303..08032fc 100644
--- a/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/mikroe-stm32f4/configs/usbnsh/defconfig
@@ -47,7 +47,6 @@ CONFIG_MMCSD=y
 CONFIG_MM_REGIONS=2
 CONFIG_MTD_PARTITION=y
 CONFIG_MTD_SMART_SECTOR_SIZE=512
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig
index 825c34f..546735f 100644
--- a/boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig
+++ b/boards/arm/stm32/nucleo-f103rb/configs/adc/defconfig
@@ -24,7 +24,6 @@ CONFIG_EXAMPLES_ADC=y
 CONFIG_EXAMPLES_ADC_GROUPSIZE=3
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig
index ad9f182..e9b9bc5 100644
--- a/boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f103rb/configs/nsh/defconfig
@@ -19,7 +19,6 @@ CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig b/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig
index 160cf9b..333ce3f 100644
--- a/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig
+++ b/boards/arm/stm32/nucleo-f103rb/configs/pwm/defconfig
@@ -20,7 +20,6 @@ CONFIG_DEFAULT_SMALL=y
 CONFIG_EXAMPLES_PWM=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig b/boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig
index 9c99a3e..cf2031c 100644
--- a/boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig
+++ b/boards/arm/stm32/nucleo-f207zg/configs/adc/defconfig
@@ -25,7 +25,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig
index 20520e0..471d271 100644
--- a/boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f207zg/configs/nsh/defconfig
@@ -21,7 +21,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
diff --git a/boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig b/boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig
index f41525b..5948d37 100644
--- a/boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig
+++ b/boards/arm/stm32/nucleo-f207zg/configs/pwm/defconfig
@@ -21,7 +21,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig
index baf98f5..c97ba4d 100644
--- a/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig
+++ b/boards/arm/stm32/nucleo-f302r8/configs/highpri/defconfig
@@ -29,7 +29,6 @@ CONFIG_LIBM=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=4
 CONFIG_NAME_MAX=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUCLEOF302R8_HIGHPRI=y
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512
 CONFIG_PREALLOC_TIMERS=2
diff --git a/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig
index 6c47443..a13535a 100644
--- a/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f302r8/configs/nsh/defconfig
@@ -30,7 +30,6 @@ CONFIG_FDCLONE_STDIO=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=4
 CONFIG_NAME_MAX=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_BASENAME=y
 CONFIG_NSH_DISABLE_CAT=y
diff --git a/boards/arm/stm32/nucleo-f303re/configs/adc/defconfig b/boards/arm/stm32/nucleo-f303re/configs/adc/defconfig
index b419547..2bbda68 100644
--- a/boards/arm/stm32/nucleo-f303re/configs/adc/defconfig
+++ b/boards/arm/stm32/nucleo-f303re/configs/adc/defconfig
@@ -24,7 +24,6 @@ CONFIG_EXAMPLES_ADC_SWTRIG=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/stm32/nucleo-f303re/configs/can/defconfig b/boards/arm/stm32/nucleo-f303re/configs/can/defconfig
index 493823e..cf6cdbd 100644
--- a/boards/arm/stm32/nucleo-f303re/configs/can/defconfig
+++ b/boards/arm/stm32/nucleo-f303re/configs/can/defconfig
@@ -23,7 +23,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=65536
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/nucleo-f303re/configs/hello/defconfig b/boards/arm/stm32/nucleo-f303re/configs/hello/defconfig
index 2cc5180..69d91f9 100644
--- a/boards/arm/stm32/nucleo-f303re/configs/hello/defconfig
+++ b/boards/arm/stm32/nucleo-f303re/configs/hello/defconfig
@@ -21,7 +21,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=65536
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/nucleo-f303re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f303re/configs/nsh/defconfig
index 82c19c5..c1bb351 100644
--- a/boards/arm/stm32/nucleo-f303re/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f303re/configs/nsh/defconfig
@@ -20,7 +20,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=65536
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig b/boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig
index 6ef2021..4bfbaa2 100644
--- a/boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig
+++ b/boards/arm/stm32/nucleo-f303re/configs/nxlines/defconfig
@@ -28,7 +28,6 @@ CONFIG_LCD_SSD1351=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NX=y
 CONFIG_NXFONT_MONO5X8=y
 CONFIG_NXSTART_EXTERNINIT=y
diff --git a/boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig b/boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig
index c77068d..fb32a90 100644
--- a/boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig
+++ b/boards/arm/stm32/nucleo-f303re/configs/pwm/defconfig
@@ -21,7 +21,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig b/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig
index 0d8353e..3b98d6a 100644
--- a/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig
+++ b/boards/arm/stm32/nucleo-f303re/configs/serialrx/defconfig
@@ -25,7 +25,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=65536
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig b/boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig
index 6f06f14..e6ca421 100644
--- a/boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig
+++ b/boards/arm/stm32/nucleo-f303ze/configs/adc/defconfig
@@ -27,7 +27,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig
index c8a89c0..17013f8 100644
--- a/boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f303ze/configs/nsh/defconfig
@@ -22,7 +22,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=65536
diff --git a/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig b/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig
index c678452..5d9764a 100644
--- a/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig
+++ b/boards/arm/stm32/nucleo-f303ze/configs/nxlines_oled/defconfig
@@ -32,7 +32,6 @@ CONFIG_LCD_SSD1306_I2C=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NX=y
 CONFIG_NXFONT_MONO5X8=y
diff --git a/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig
index 46422d1..a2ec213 100644
--- a/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig
+++ b/boards/arm/stm32/nucleo-f334r8/configs/adc/defconfig
@@ -32,7 +32,6 @@ CONFIG_FDCLONE_STDIO=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=4
 CONFIG_NAME_MAX=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_BASENAME=y
diff --git a/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig
index cb144c5..55c4857 100644
--- a/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig
+++ b/boards/arm/stm32/nucleo-f334r8/configs/highpri/defconfig
@@ -29,7 +29,6 @@ CONFIG_LIBM=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=4
 CONFIG_NAME_MAX=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUCLEOF334R8_HIGHPRI=y
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512
 CONFIG_PREALLOC_TIMERS=2
diff --git a/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig
index db27ac0..2af4ac0 100644
--- a/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f334r8/configs/nsh/defconfig
@@ -30,7 +30,6 @@ CONFIG_FDCLONE_STDIO=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=4
 CONFIG_NAME_MAX=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_BASENAME=y
 CONFIG_NSH_DISABLE_CAT=y
diff --git a/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig
index b7fd316..1a25c1e 100644
--- a/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig
+++ b/boards/arm/stm32/nucleo-f334r8/configs/spwm1/defconfig
@@ -29,7 +29,6 @@ CONFIG_LIBM=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=4
 CONFIG_NAME_MAX=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUCLEOF334R8_SPWM=y
 CONFIG_NUCLEOF334R8_SPWM_PHASE_NUM=3
 CONFIG_NUCLEOF334R8_SPWM_USE_HRTIM1=y
diff --git a/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig b/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig
index e2cd854..b14553c 100644
--- a/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig
+++ b/boards/arm/stm32/nucleo-f334r8/configs/spwm2/defconfig
@@ -31,7 +31,6 @@ CONFIG_LIBM=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=4
 CONFIG_NAME_MAX=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUCLEOF334R8_SPWM=y
 CONFIG_NUCLEOF334R8_SPWM_PHASE_NUM=4
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512
diff --git a/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig
index 262465f..e937108 100644
--- a/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f410rb/configs/nsh/defconfig
@@ -29,7 +29,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HEAP_COLORATION=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/nucleo-f412zg/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f412zg/configs/nsh/defconfig
index 7d709e1..396c6a2 100644
--- a/boards/arm/stm32/nucleo-f412zg/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f412zg/configs/nsh/defconfig
@@ -34,7 +34,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_I2C=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig b/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig
index 9965b15..e52b9cc 100644
--- a/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig
+++ b/boards/arm/stm32/nucleo-f429zi/configs/netnsh/defconfig
@@ -44,7 +44,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig
index 61a33b0..a565607 100644
--- a/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f429zi/configs/nsh/defconfig
@@ -26,7 +26,6 @@ CONFIG_HEAP2_SIZE=8388608
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/nucleo-f446re/configs/can/defconfig b/boards/arm/stm32/nucleo-f446re/configs/can/defconfig
index a74a95e..4f31ee2 100644
--- a/boards/arm/stm32/nucleo-f446re/configs/can/defconfig
+++ b/boards/arm/stm32/nucleo-f446re/configs/can/defconfig
@@ -31,7 +31,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig
index 170f410..3fcb076 100644
--- a/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f446re/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig b/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig
index 0e35dae..2054fd4 100644
--- a/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f4x1re/configs/f401-nsh/defconfig
@@ -26,7 +26,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig b/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig
index 1ed0abb..d8f1846 100644
--- a/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig
+++ b/boards/arm/stm32/nucleo-f4x1re/configs/f411-mcp2515-extid/defconfig
@@ -36,7 +36,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MCP2515_PHASESEG1=3
 CONFIG_MCP2515_PROPSEG=1
 CONFIG_MCP2515_SPI_SCK_FREQUENCY=500000
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig b/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig
index 3d6223f..a0f415f 100644
--- a/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig
+++ b/boards/arm/stm32/nucleo-f4x1re/configs/f411-nsh/defconfig
@@ -26,7 +26,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/nucleo-g431rb/configs/nsh/defconfig b/boards/arm/stm32/nucleo-g431rb/configs/nsh/defconfig
index abdd78e..427603d 100644
--- a/boards/arm/stm32/nucleo-g431rb/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-g431rb/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig b/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig
index e730359..9555afb 100644
--- a/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig
+++ b/boards/arm/stm32/nucleo-l152re/configs/lcd/defconfig
@@ -39,7 +39,6 @@ CONFIG_LCD_ILI9341_IFACE0_PORTRAIT=y
 CONFIG_LCD_PORTRAIT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig
index 86d564d..73480b1 100644
--- a/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig
+++ b/boards/arm/stm32/nucleo-l152re/configs/nsh/defconfig
@@ -26,7 +26,7 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig
index 01ff2c8..4f45c17 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/bmp180/defconfig
@@ -31,7 +31,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig
index d48d715..21006c6 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/dac/defconfig
@@ -34,7 +34,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig
index c30dd2c..bbb7f34 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/discover/defconfig
@@ -42,7 +42,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig
index 6a53af6..069c6ff 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/ina219/defconfig
@@ -32,7 +32,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig
index 745bf69..f4c4de8 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-6lowpan/defconfig
@@ -81,7 +81,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_WRITE_BUFFERS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig
index 82530ed..e8d5b35 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/mrf24j40-mac/defconfig
@@ -40,7 +40,6 @@ CONFIG_IEEE802154_MRF24J40=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig
index 4519aab..e8bbfe8 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/netnsh/defconfig
@@ -45,7 +45,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig
index b47167e..844ad17 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig
index d4437a8..dae10e9 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/telnetd/defconfig
@@ -48,7 +48,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig
index c9ef555..e466d51 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/timer/defconfig
@@ -30,7 +30,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig
index f79b861..e096190 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/usbnsh/defconfig
@@ -31,7 +31,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig b/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig
index 77a7ead..b627c07 100644
--- a/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig
+++ b/boards/arm/stm32/olimex-stm32-e407/configs/webserver/defconfig
@@ -44,7 +44,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig b/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig
index 8b0f445..f87669d 100644
--- a/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-h405/configs/usbnsh/defconfig
@@ -37,7 +37,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
 CONFIG_NSH_DISABLE_PUT=y
diff --git a/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig
index 7423d2d..1b25093 100644
--- a/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-h407/configs/nsh/defconfig
@@ -28,7 +28,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig b/boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig
index 910c9a2..9cf01ef 100644
--- a/boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig
+++ b/boards/arm/stm32/olimex-stm32-h407/configs/nsh_uext/defconfig
@@ -26,7 +26,6 @@ CONFIG_FS_PROCFS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig
index c3cf1ac..4ac073d 100644
--- a/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p107/configs/nsh/defconfig
@@ -40,7 +40,6 @@ CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig
index c5c3f31..77ba4ce 100644
--- a/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p207/configs/nsh/defconfig
@@ -42,7 +42,6 @@ CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
 CONFIG_NSH_DISABLE_PUT=y
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/audio/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/audio/defconfig
index 26a2ac7..3d5b9c8 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/audio/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/audio/defconfig
@@ -31,7 +31,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig
index af18021..1d45d71 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/dhtxx/defconfig
@@ -30,7 +30,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig
index 8e7a003..f74dbb9 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/hidkbd/defconfig
@@ -26,7 +26,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig
index ce7bd00..50a1939 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/defconfig
@@ -34,7 +34,6 @@ CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_KERNEL_HEAPSIZE=16384
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUTTX_USERSPACE=0x08020000
 CONFIG_PASS1_BUILDIR="boards/arm/stm32/olimex-stm32-p407/kernel"
 CONFIG_PATH_INITIAL="/mnt/vfat"
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig
index 41924ce..ecc3d29 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/defconfig
@@ -33,7 +33,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MM_KERNEL_HEAPSIZE=16384
 CONFIG_MM_REGIONS=2
 CONFIG_MODULE=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUTTX_USERSPACE=0x08020000
 CONFIG_PASS1_BUILDIR="boards/arm/stm32/olimex-stm32-p407/kernel"
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig
index 15d92c0..928051f 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/defconfig
@@ -25,7 +25,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_KERNEL_HEAPSIZE=16384
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_GET=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/module/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/module/defconfig
index aef7dc4..4238f1a 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/module/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/module/defconfig
@@ -27,7 +27,6 @@ CONFIG_FS_ROMFS=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_MAX_TASKS=16
 CONFIG_MODULE=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig
index f066498..4c1b64d 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/nsh/defconfig
@@ -25,7 +25,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig b/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig
index ce1637f..0b2b1b3 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/zmodem/defconfig
@@ -30,7 +30,6 @@ CONFIG_I2S=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/olimexino-stm32/configs/can/defconfig b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig
index 72902bc..bf612b8 100644
--- a/boards/arm/stm32/olimexino-stm32/configs/can/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig
@@ -56,7 +56,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=0
 CONFIG_MAX_TASKS=16
 CONFIG_MM_SMALL=y
 CONFIG_NAME_MAX=8
-CONFIG_NFILE_DESCRIPTORS=5
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=5
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CODECS_BUFSIZE=0
diff --git a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig
index ca9a648..e0e252e 100644
--- a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig
@@ -75,7 +75,7 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MM_SMALL=y
 CONFIG_NAME_MAX=8
-CONFIG_NFILE_DESCRIPTORS=5
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=5
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CODECS_BUFSIZE=0
diff --git a/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig
index 78b5782..4692b78 100644
--- a/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig
@@ -63,7 +63,7 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MM_SMALL=y
 CONFIG_NAME_MAX=8
-CONFIG_NFILE_DESCRIPTORS=5
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=5
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CODECS_BUFSIZE=0
diff --git a/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig b/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig
index a7fe9d9..ebe4b26 100644
--- a/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/smallnsh/defconfig
@@ -39,7 +39,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=0
 CONFIG_MAX_TASKS=4
 CONFIG_MM_SMALL=y
 CONFIG_NAME_MAX=8
-CONFIG_NFILE_DESCRIPTORS=5
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=5
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CODECS_BUFSIZE=0
diff --git a/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig
index 468fb8e..09e085c 100644
--- a/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig
+++ b/boards/arm/stm32/olimexino-stm32/configs/tiny/defconfig
@@ -40,7 +40,7 @@ CONFIG_LIB_SENDFILE_BUFSIZE=0
 CONFIG_MAX_TASKS=4
 CONFIG_MM_SMALL=y
 CONFIG_NAME_MAX=8
-CONFIG_NFILE_DESCRIPTORS=5
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=5
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=768
 CONFIG_PREALLOC_TIMERS=2
 CONFIG_PRIORITY_INHERITANCE=y
diff --git a/boards/arm/stm32/omnibusf4/configs/nsh/defconfig b/boards/arm/stm32/omnibusf4/configs/nsh/defconfig
index cf8f442..550bf27 100644
--- a/boards/arm/stm32/omnibusf4/configs/nsh/defconfig
+++ b/boards/arm/stm32/omnibusf4/configs/nsh/defconfig
@@ -61,7 +61,6 @@ CONFIG_MPU60X0_EXTI=y
 CONFIG_MTD=y
 CONFIG_MTD_M25P=y
 CONFIG_MTD_SECT512=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/photon/configs/nsh/defconfig b/boards/arm/stm32/photon/configs/nsh/defconfig
index d9bf489..1a2428e 100644
--- a/boards/arm/stm32/photon/configs/nsh/defconfig
+++ b/boards/arm/stm32/photon/configs/nsh/defconfig
@@ -24,7 +24,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/photon/configs/rgbled/defconfig b/boards/arm/stm32/photon/configs/rgbled/defconfig
index 9093e86..db7ac09 100644
--- a/boards/arm/stm32/photon/configs/rgbled/defconfig
+++ b/boards/arm/stm32/photon/configs/rgbled/defconfig
@@ -29,7 +29,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/photon/configs/usbnsh/defconfig b/boards/arm/stm32/photon/configs/usbnsh/defconfig
index 7a9b187..bb5351f 100644
--- a/boards/arm/stm32/photon/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/photon/configs/usbnsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/photon/configs/wlan/defconfig b/boards/arm/stm32/photon/configs/wlan/defconfig
index 97721e9..3b90e0a 100644
--- a/boards/arm/stm32/photon/configs/wlan/defconfig
+++ b/boards/arm/stm32/photon/configs/wlan/defconfig
@@ -57,7 +57,6 @@ CONFIG_NET_PKT=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/shenzhou/configs/nsh/defconfig b/boards/arm/stm32/shenzhou/configs/nsh/defconfig
index e0eedf9..4da0bda 100644
--- a/boards/arm/stm32/shenzhou/configs/nsh/defconfig
+++ b/boards/arm/stm32/shenzhou/configs/nsh/defconfig
@@ -42,7 +42,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/shenzhou/configs/nxwm/defconfig b/boards/arm/stm32/shenzhou/configs/nxwm/defconfig
index 6637f75..f9d30a4 100644
--- a/boards/arm/stm32/shenzhou/configs/nxwm/defconfig
+++ b/boards/arm/stm32/shenzhou/configs/nxwm/defconfig
@@ -54,7 +54,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=28
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
diff --git a/boards/arm/stm32/shenzhou/configs/thttpd/defconfig b/boards/arm/stm32/shenzhou/configs/thttpd/defconfig
index a5dbb94..dabe049 100644
--- a/boards/arm/stm32/shenzhou/configs/thttpd/defconfig
+++ b/boards/arm/stm32/shenzhou/configs/thttpd/defconfig
@@ -49,7 +49,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=24
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig b/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig
index 9b46625..54bded9 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/composite/defconfig
@@ -32,7 +32,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MTD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=65536
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig
index 8ff96ff..5f9d3b2 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/nsh/defconfig
@@ -26,7 +26,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MTD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig
index 6c05f19..189bb1c 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/nsh2/defconfig
@@ -58,7 +58,6 @@ CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_MTD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig
index 48d16ab..94e4bd7 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/nx/defconfig
@@ -39,7 +39,6 @@ CONFIG_LCD_NOGETRUN=y
 CONFIG_LCD_RPORTRAIT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=12
 CONFIG_NX=y
 CONFIG_NXFONT_SANS23X27=y
 CONFIG_NXTK_BORDERCOLOR1=0xad55
diff --git a/boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig b/boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig
index 2324002..ade9d66 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/nxterm/defconfig
@@ -28,7 +28,6 @@ CONFIG_LCD_MAXCONTRAST=1
 CONFIG_LCD_NOGETRUN=y
 CONFIG_MAX_TASKS=16
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=12
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm3210e-eval/configs/pm/defconfig b/boards/arm/stm32/stm3210e-eval/configs/pm/defconfig
index 9b8ac9e..fc888a0 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/pm/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/pm/defconfig
@@ -50,7 +50,6 @@ CONFIG_LCD_NOGETRUN=y
 CONFIG_LCD_RPORTRAIT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig b/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig
index 3a016c5..2e230a3 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/usbmsc/defconfig
@@ -21,7 +21,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SDIO=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=65536
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig b/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig
index 04b751e..df0b7be 100644
--- a/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig
+++ b/boards/arm/stm32/stm3210e-eval/configs/usbserial/defconfig
@@ -20,7 +20,6 @@ CONFIG_EXAMPLES_USBSERIAL=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PL2303=y
 CONFIG_PL2303_PRODUCTSTR="USBdev Serial"
 CONFIG_PL2303_RXBUFSIZE=512
diff --git a/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig b/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig
index 9bc0dbb..f1f8cc6 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/dhcpd/defconfig
@@ -35,7 +35,6 @@ CONFIG_NET_ICMP=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NUNGET_CHARS=0
 CONFIG_RAM_SIZE=196608
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig
index d42b463..e9c3454 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/nettest/defconfig
@@ -34,7 +34,6 @@ CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NUNGET_CHARS=0
 CONFIG_RAM_SIZE=196608
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig
index 230bb8f..d00332f 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/nsh/defconfig
@@ -45,7 +45,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig
index cc62c36..a76f464 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/nsh2/defconfig
@@ -55,7 +55,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig b/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig
index 1b950f5..704237d 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/nxwm/defconfig
@@ -54,7 +54,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=22
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig b/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig
index b6cfd0b..012e167 100644
--- a/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig
+++ b/boards/arm/stm32/stm3220g-eval/configs/telnetd/defconfig
@@ -37,7 +37,6 @@ CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NUNGET_CHARS=0
 CONFIG_RAM_SIZE=196608
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig b/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig
index 9930da5..5dc7600 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/dhcpd/defconfig
@@ -36,7 +36,6 @@ CONFIG_NET_ICMP=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NUNGET_CHARS=0
 CONFIG_RAM_SIZE=196608
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig b/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig
index a6ee50d..7012877 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/discover/defconfig
@@ -44,7 +44,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=196608
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig b/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig
index 290bb7a..a592512 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/fb/defconfig
@@ -36,7 +36,6 @@ CONFIG_LCD_NOGETRUN=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=12
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig
index bed7ad1..8e33f7a 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/knxwm/defconfig
@@ -41,7 +41,6 @@ CONFIG_LIB_USRWORK=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=12
 CONFIG_NUTTX_USERSPACE=0x08040000
 CONFIG_NX=y
 CONFIG_NXFONT_SANS22X29B=y
diff --git a/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig
index c778bf1..0fa84e5 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/nettest/defconfig
@@ -36,7 +36,6 @@ CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NUNGET_CHARS=0
 CONFIG_RAM_SIZE=196608
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig
index ff8d0d3..6dc0998 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/nsh/defconfig
@@ -49,7 +49,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig
index 15dde9f..bfce92b 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/nsh2/defconfig
@@ -56,7 +56,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig
index 1c1c286..9dad057 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/nxterm/defconfig
@@ -58,7 +58,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=22
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
diff --git a/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig b/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig
index 2eef508..62fcfe5 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/nxwm/defconfig
@@ -54,7 +54,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=22
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig b/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig
index 63b2093..d8cf546 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/telnetd/defconfig
@@ -38,7 +38,6 @@ CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NUNGET_CHARS=0
 CONFIG_RAM_SIZE=196608
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig b/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig
index 3b4f569..8680812 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/webserver/defconfig
@@ -45,7 +45,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig b/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig
index 0c1440f..e6b11a0 100644
--- a/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig
+++ b/boards/arm/stm32/stm3240g-eval/configs/xmlrpc/defconfig
@@ -43,7 +43,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=196608
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig b/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig
index 2b8a900..7143e71 100644
--- a/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32_tiny/configs/nsh/defconfig
@@ -31,7 +31,6 @@ CONFIG_DEFAULT_SMALL=y
 CONFIG_DRIVERS_WIRELESS=y
 CONFIG_EXAMPLES_NRF24L01TERM=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig b/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig
index 41187f9..93f4f0e 100644
--- a/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/stm32_tiny/configs/usbnsh/defconfig
@@ -35,7 +35,6 @@ CONFIG_CDCACM_RXBUFSIZE=256
 CONFIG_CDCACM_TXBUFSIZE=256
 CONFIG_DEFAULT_SMALL=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_LINELEN=80
diff --git a/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig
index 523e78a..3dc8b3f 100644
--- a/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32butterfly2/configs/nsh/defconfig
@@ -40,7 +40,6 @@ CONFIG_LIBC_STRERROR=y
 CONFIG_LIBC_STRERROR_SHORT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_MOTD=y
diff --git a/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig
index 6cbd67b..4a2f4ad 100644
--- a/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig
+++ b/boards/arm/stm32/stm32butterfly2/configs/nshnet/defconfig
@@ -53,7 +53,6 @@ CONFIG_NET_LOCAL=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_SPLIT=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_MOTD=y
diff --git a/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig
index 26bb0eb..db9215d 100644
--- a/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig
+++ b/boards/arm/stm32/stm32butterfly2/configs/nshusbdev/defconfig
@@ -38,7 +38,6 @@ CONFIG_LIBC_STRERROR=y
 CONFIG_LIBC_STRERROR_SHORT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_MOTD=y
diff --git a/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig b/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig
index 523e78a..3dc8b3f 100644
--- a/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig
+++ b/boards/arm/stm32/stm32butterfly2/configs/nshusbhost/defconfig
@@ -40,7 +40,6 @@ CONFIG_LIBC_STRERROR=y
 CONFIG_LIBC_STRERROR_SHORT=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_MOTD=y
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig
index f17350a..355bc52 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/apds9960/defconfig
@@ -31,7 +31,6 @@ CONFIG_EXAMPLES_APDS9960=y
 CONFIG_I2C_DRIVER=y
 CONFIG_IDLETHREAD_STACKSIZE=512
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig
index ccaa1025..08a6e99 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/audio_tone/defconfig
@@ -31,7 +31,6 @@ CONFIG_BUILTIN=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_DRIVERS_AUDIO=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig
index 69948c7..bbd7994 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/buttons/defconfig
@@ -36,7 +36,6 @@ CONFIG_DEFAULT_SMALL=y
 CONFIG_EXAMPLES_BUTTONS=y
 CONFIG_INPUT=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig
index b01c2a3..762346b 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/hello/defconfig
@@ -31,7 +31,6 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_FDCLONE_STDIO=y
 CONFIG_MAX_TASKS=4
 CONFIG_MM_SMALL=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_DISABLE_CP=y
 CONFIG_NSH_DISABLE_MKDIR=y
 CONFIG_NSH_DISABLE_MOUNT=y
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig
index 5212370..66e7729 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/jlx12864g/defconfig
@@ -36,7 +36,6 @@ CONFIG_LCD=y
 CONFIG_LCD_ST7567=y
 CONFIG_MAX_TASKS=16
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig
index 5d9cbea..57fad56 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/lcd1602/defconfig
@@ -35,7 +35,6 @@ CONFIG_I2CTOOL_MINBUS=1
 CONFIG_LCD_BACKPACK=y
 CONFIG_LCD_LCD1602=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig
index 26148a6..e985b7c 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/mcp2515/defconfig
@@ -36,7 +36,6 @@ CONFIG_EXAMPLES_CAN_READ=y
 CONFIG_MAX_TASKS=16
 CONFIG_MCP2515_PHASESEG1=3
 CONFIG_MCP2515_PROPSEG=1
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig
index 9c9ca92..3dd9241 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/nrf24/defconfig
@@ -30,7 +30,6 @@ CONFIG_DEFAULT_SMALL=y
 CONFIG_DRIVERS_WIRELESS=y
 CONFIG_EXAMPLES_NRF24L01TERM=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig
index 36a76fe..45fd685 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
 CONFIG_BUILTIN=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig
index a729d4a..ee0ad90 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/pwm/defconfig
@@ -29,7 +29,6 @@ CONFIG_BUILTIN=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_EXAMPLES_PWM=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig
index 9433349..74335ab 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/rfid-rc522/defconfig
@@ -31,7 +31,6 @@ CONFIG_DEFAULT_SMALL=y
 CONFIG_DRIVERS_CONTACTLESS=y
 CONFIG_EXAMPLES_RFID_READUID=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig
index 5693b5f..2687886 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/rgbled/defconfig
@@ -29,7 +29,6 @@ CONFIG_BUILTIN=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_EXAMPLES_RGBLED=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig
index db6a691..e9f73ba 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/usbnsh/defconfig
@@ -35,7 +35,6 @@ CONFIG_CDCACM_RXBUFSIZE=256
 CONFIG_CDCACM_TXBUFSIZE=256
 CONFIG_DEFAULT_SMALL=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_LINELEN=80
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig
index 677a066..317f259 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/userled/defconfig
@@ -31,7 +31,6 @@ CONFIG_BUILTIN=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_EXAMPLES_LEDS=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig b/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig
index 2778546..7ede642 100644
--- a/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig
+++ b/boards/arm/stm32/stm32f103-minimum/configs/veml6070/defconfig
@@ -29,7 +29,6 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
 CONFIG_BUILTIN=y
 CONFIG_DEFAULT_SMALL=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=1024
diff --git a/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig b/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig
index 81f4f5a..feacaa2 100644
--- a/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig
+++ b/boards/arm/stm32/stm32f334-disco/configs/buckboost/defconfig
@@ -42,7 +42,6 @@ CONFIG_LIBDSP=y
 CONFIG_LIBM=y
 CONFIG_MAX_TASKS=4
 CONFIG_NAME_MAX=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_BASENAME=y
diff --git a/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig
index dc83296..9751fcf 100644
--- a/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32f334-disco/configs/nsh/defconfig
@@ -32,7 +32,6 @@ CONFIG_FDCLONE_STDIO=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=4
 CONFIG_NAME_MAX=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_BASENAME=y
 CONFIG_NSH_DISABLE_CAT=y
diff --git a/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig b/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig
index fa805ca..920e7b4 100644
--- a/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig
+++ b/boards/arm/stm32/stm32f334-disco/configs/powerled/defconfig
@@ -38,7 +38,6 @@ CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBM=y
 CONFIG_MAX_TASKS=4
 CONFIG_NAME_MAX=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_BASENAME=y
diff --git a/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig b/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig
index 90ce999..b2a26e5 100644
--- a/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32f3discovery/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig
index 4fdce3b..5e313ad 100644
--- a/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/stm32f3discovery/configs/usbnsh/defconfig
@@ -31,7 +31,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f411-minimum/configs/nsh/defconfig b/boards/arm/stm32/stm32f411-minimum/configs/nsh/defconfig
index 48a2408..6af4bfa 100644
--- a/boards/arm/stm32/stm32f411-minimum/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32f411-minimum/configs/nsh/defconfig
@@ -26,7 +26,6 @@ CONFIG_BUILTIN=y
 CONFIG_HAVE_CXX=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig
index b478003..61b07b7 100644
--- a/boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32f411e-disco/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_BUILTIN=y
 CONFIG_HAVE_CXX=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig
index 7e61034..08ab383 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/adc/defconfig
@@ -31,7 +31,6 @@ CONFIG_HEAP2_SIZE=8388608
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig
index 28fa65a..d827d25 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/extflash/defconfig
@@ -32,7 +32,6 @@ CONFIG_MTD_CONFIG_RAM_CONSOLIDATE=y
 CONFIG_MTD_PARTITION=y
 CONFIG_MTD_PARTITION_NAMES=y
 CONFIG_MTD_SMART_SECTOR_SIZE=512
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig
index b6d8889..7d40d3d 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/fb/defconfig
@@ -35,7 +35,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig
index cc085b7..05fff91 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/highpri/defconfig
@@ -27,7 +27,6 @@ CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBM=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PWM=y
 CONFIG_RAM_SIZE=114688
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig
index d3a9717..b78a9ac 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/lcd/defconfig
@@ -36,7 +36,6 @@ CONFIG_LCD_ILI9341_IFACE0=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig
index 1a8747a..527079f 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/lvgl/defconfig
@@ -39,7 +39,6 @@ CONFIG_LV_VER_RES=320
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig
index ed2b2e9..5e9167f 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/nsh/defconfig
@@ -26,7 +26,6 @@ CONFIG_HEAP2_SIZE=8388608
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig
index 75e9c34..a5a4a04 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/nxhello/defconfig
@@ -35,7 +35,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig
index a51745f..edf5eb8 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/nxwm/defconfig
@@ -40,7 +40,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig
index 6ecbd26..8d032fd 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/usbmsc/defconfig
@@ -27,7 +27,6 @@ CONFIG_HEAP2_SIZE=8388608
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig
index 328fa7b..5816312 100644
--- a/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/stm32f429i-disco/configs/usbnsh/defconfig
@@ -35,7 +35,6 @@ CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig b/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig
index 5600d2b..99b1dd6 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/audio/defconfig
@@ -38,7 +38,6 @@ CONFIG_I2C_RESET=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig
index 9f7b9f0..174e9e2 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig
@@ -29,7 +29,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig
index 8789200..37ec47b 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/defconfig
@@ -23,7 +23,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBM=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig b/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig
index 5f054ab..fde912c 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/elf/defconfig
@@ -27,7 +27,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
diff --git a/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig b/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig
index 22d39cc..a774de3 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/hciuart/defconfig
@@ -46,7 +46,6 @@ CONFIG_NETDEV_LATEINIT=y
 CONFIG_NETDEV_PHY_IOCTL=y
 CONFIG_NET_BLUETOOTH=y
 CONFIG_NET_SOCKOPTS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig b/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig
index dc439d3..2c396f7 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/ipv6/defconfig
@@ -50,7 +50,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig b/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig
index c103944..627462d 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/kostest/defconfig
@@ -24,7 +24,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUTTX_USERSPACE=0x08020000
 CONFIG_PASS1_BUILDIR="boards/arm/stm32/stm32f4discovery/kernel"
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/stm32/stm32f4discovery/configs/lcd1602/defconfig b/boards/arm/stm32/stm32f4discovery/configs/lcd1602/defconfig
index 1339a61..e9ba8a0 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/lcd1602/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/lcd1602/defconfig
@@ -31,7 +31,6 @@ CONFIG_LCD_BACKPACK=y
 CONFIG_LCD_LCD1602=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f4discovery/configs/lwl/defconfig b/boards/arm/stm32/stm32f4discovery/configs/lwl/defconfig
index 76de27b..6eb7d66 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/lwl/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/lwl/defconfig
@@ -28,7 +28,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LWL_CONSOLE=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig b/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig
index 4f850f3..4c2bc69 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/max31855/defconfig
@@ -28,7 +28,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig b/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig
index 76f5afb..daa86a7 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/max7219/defconfig
@@ -55,7 +55,6 @@ CONFIG_MAX7219_NHORIZONTALBLKS=4
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NX=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig b/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig
index 2d73450..d524c8b 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/mmcsdspi/defconfig
@@ -41,7 +41,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MM_REGIONS=2
 CONFIG_NETUTILS_CODECS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f4discovery/configs/module/defconfig b/boards/arm/stm32/stm32f4discovery/configs/module/defconfig
index 72943f5..770a306 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/module/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/module/defconfig
@@ -28,7 +28,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MODULE=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig
index 959a60c..1fd6d5d 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/netnsh/defconfig
@@ -55,7 +55,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig
index e07ec5a..175dac0 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/nsh/defconfig
@@ -28,7 +28,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig b/boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig
index 1d23d59..05c42e4 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/nxlines/defconfig
@@ -39,7 +39,6 @@ CONFIG_LCD_SSD1289=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig b/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig
index 65dfa9e..2088376 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/pm/defconfig
@@ -27,7 +27,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig
index 66d208c..135bd39 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/defconfig
@@ -30,7 +30,6 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PATH_INITIAL="/mnt/romfs"
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
diff --git a/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig b/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig
index 1313352..27c745b 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/pseudoterm/defconfig
@@ -27,7 +27,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig
index 09f2dc4..a11f098 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/rgbled/defconfig
@@ -27,7 +27,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig
index 5189ca0..619d17f 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/rndis/defconfig
@@ -59,7 +59,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NFS=y
 CONFIG_NFS_STATISTICS=y
 CONFIG_NSH_ARCHINIT=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/st7789/defconfig b/boards/arm/stm32/stm32f4discovery/configs/st7789/defconfig
index 9365a32..dbe45f1 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/st7789/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/st7789/defconfig
@@ -34,7 +34,6 @@ CONFIG_LCD_PORTRAIT=y
 CONFIG_LCD_ST7789=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig
index 6b25e43..f949ee7 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/defconfig
@@ -28,7 +28,6 @@ CONFIG_LIBC_LOCALTIME=y
 CONFIG_LIBM=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig b/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig
index 2d0e5d4..19faecb 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/usbmsc/defconfig
@@ -26,7 +26,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig b/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig
index 4dc61ae..7866702 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/usbnsh/defconfig
@@ -32,7 +32,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig b/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig
index 9f48660..a305d58 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/wifi/defconfig
@@ -64,7 +64,6 @@ CONFIG_NET_UDP_NO_STACK=y
 CONFIG_NET_USRSOCK=y
 CONFIG_NET_USRSOCK_CONNS=16
 CONFIG_NET_USRSOCK_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig b/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig
index 3de2db5..1213b09 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/winbuild/defconfig
@@ -22,7 +22,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig b/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig
index ac8e020..bc201a4 100644
--- a/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig
+++ b/boards/arm/stm32/stm32f4discovery/configs/xen1210/defconfig
@@ -26,7 +26,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig b/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig
index 23cbd33..574f3dd 100644
--- a/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig
+++ b/boards/arm/stm32/stm32ldiscovery/configs/chrono/defconfig
@@ -37,7 +37,7 @@ CONFIG_LIB_SLCDCODEC=y
 CONFIG_LWL_CONSOLE=y
 CONFIG_MAX_TASKS=8
 CONFIG_MM_SMALL=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
diff --git a/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig b/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig
index 7f5856a..0604411 100644
--- a/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32ldiscovery/configs/nsh/defconfig
@@ -27,7 +27,7 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=8
 CONFIG_MM_SMALL=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
 CONFIG_NSH_DISABLE_MKDIR=y
diff --git a/boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig b/boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig
index 1ad4765c..9f2b637 100644
--- a/boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig
+++ b/boards/arm/stm32/stm32vldiscovery/configs/nsh/defconfig
@@ -35,7 +35,7 @@ CONFIG_DEFAULT_SMALL=y
 CONFIG_IDLETHREAD_STACKSIZE=128
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=4
-CONFIG_NFILE_DESCRIPTORS=4
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=128
diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig
index 043c09a..d2bb668 100644
--- a/boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig
+++ b/boards/arm/stm32/viewtool-stm32f107/configs/ft80x/defconfig
@@ -24,7 +24,6 @@ CONFIG_LCD=y
 CONFIG_LCD_FT80X=y
 CONFIG_LCD_FT80X_AUDIO_GPIOSHUTDOWN=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig
index 0a83399..f3e4026 100644
--- a/boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig
+++ b/boards/arm/stm32/viewtool-stm32f107/configs/highpri/defconfig
@@ -19,7 +19,6 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=65536
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig
index fa92fea..6bae551 100644
--- a/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig
+++ b/boards/arm/stm32/viewtool-stm32f107/configs/netnsh/defconfig
@@ -47,7 +47,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig
index b44a022..e120948 100644
--- a/boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig
+++ b/boards/arm/stm32/viewtool-stm32f107/configs/nsh/defconfig
@@ -20,7 +20,6 @@ CONFIG_FS_PROCFS=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig b/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig
index f322cec..ec2dfa0 100644
--- a/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig
+++ b/boards/arm/stm32/viewtool-stm32f107/configs/tcpblaster/defconfig
@@ -41,7 +41,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_TCP_WRITE_BUFFERS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig
index dca5317..2358e62 100644
--- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig
+++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/adc/defconfig
@@ -29,7 +29,7 @@ CONFIG_EXAMPLES_ADC_SWTRIG=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig
index e554e56..66dd577 100644
--- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nsh/defconfig
@@ -26,7 +26,7 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig
index 5b719b0..b523ce3 100644
--- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig
+++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/nxlines_oled/defconfig
@@ -32,7 +32,7 @@ CONFIG_LCD_SH1106_OLED_132=y
 CONFIG_LCD_SSD1306_I2C=y
 CONFIG_MAX_TASKS=8
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
diff --git a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig
index 0b8eaa6..12bd849 100644
--- a/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig
+++ b/boards/arm/stm32f0l0g0/b-l072z-lrwan1/configs/sx127x/defconfig
@@ -34,7 +34,7 @@ CONFIG_LPWAN_SX127X_RFFREQ_DEFAULT=930000000
 CONFIG_LPWAN_SX127X_RXSUPPORT=y
 CONFIG_LPWAN_SX127X_TXSUPPORT=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
diff --git a/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig
index f22a7d6..4668628 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/nucleo-f072rb/configs/nsh/defconfig
@@ -26,7 +26,7 @@ CONFIG_DISABLE_MQUEUE=y
 CONFIG_FS_PROCFS=y
 CONFIG_MAX_TASKS=8
 CONFIG_MM_SMALL=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CP=y
diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig
index 1507fc9..a9b2741 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/nsh/defconfig
@@ -28,7 +28,7 @@ CONFIG_DISABLE_MQUEUE=y
 CONFIG_FS_PROCFS=y
 CONFIG_MAX_TASKS=8
 CONFIG_MM_SMALL=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CP=y
diff --git a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig
index 68e251a..2107ce7 100644
--- a/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig
+++ b/boards/arm/stm32f0l0g0/nucleo-f091rc/configs/sx127x/defconfig
@@ -33,7 +33,7 @@ CONFIG_LPWAN_SX127X_MODULATION_DEFAULT=1
 CONFIG_LPWAN_SX127X_RXSUPPORT=y
 CONFIG_LPWAN_SX127X_TXSUPPORT=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
diff --git a/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig
index d5233ab..addab2d 100644
--- a/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/nucleo-g070rb/configs/nsh/defconfig
@@ -40,7 +40,7 @@ CONFIG_I2CTOOL_MINADDR=0x00
 CONFIG_INPUT=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig
index f5b78b6..ed9f4b4 100644
--- a/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/nucleo-g071rb/configs/nsh/defconfig
@@ -24,7 +24,7 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig
index 88af69c..3a22d95 100644
--- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/nsh/defconfig
@@ -26,7 +26,7 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig
index 93e4bd5..cb5ede5 100644
--- a/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig
+++ b/boards/arm/stm32f0l0g0/nucleo-l073rz/configs/sx127x/defconfig
@@ -34,7 +34,7 @@ CONFIG_LPWAN_SX127X_MODULATION_DEFAULT=1
 CONFIG_LPWAN_SX127X_RXSUPPORT=y
 CONFIG_LPWAN_SX127X_TXSUPPORT=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=64
diff --git a/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig
index 6393399..0f64b0e 100644
--- a/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/stm32f051-discovery/configs/nsh/defconfig
@@ -25,7 +25,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_MAX_TASKS=8
 CONFIG_MM_SMALL=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
 CONFIG_NSH_DISABLE_MKDIR=y
diff --git a/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig b/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig
index 67ca5b5..c9afd8d 100644
--- a/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig
+++ b/boards/arm/stm32f0l0g0/stm32f072-discovery/configs/nsh/defconfig
@@ -25,7 +25,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_MAX_TASKS=8
 CONFIG_MM_SMALL=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_DISABLE_CD=y
 CONFIG_NSH_DISABLE_CP=y
 CONFIG_NSH_DISABLE_MKDIR=y
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig
index 2654115..846afa7 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig
+++ b/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig
index 2d8d355..bd9c3b3 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig
+++ b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/defconfig
@@ -31,7 +31,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig
index a41eca2..8b70a34 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig
+++ b/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig
index bd0b33c..34575a9 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig
+++ b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/defconfig
@@ -31,7 +31,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig
index 0ba753f..c024f2e 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig
+++ b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/defconfig
@@ -46,7 +46,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig b/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig
index 67c94ca..6948d4e 100644
--- a/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig
+++ b/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig
index e729825..bbb13a6 100644
--- a/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig
+++ b/boards/arm/stm32f7/stm32f746-ws/configs/nsh/defconfig
@@ -52,7 +52,6 @@ CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 CONFIG_MMCSD_SDIO=y
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/audio/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/audio/defconfig
index 79b719c..88d74d6 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/configs/audio/defconfig
+++ b/boards/arm/stm32f7/stm32f746g-disco/configs/audio/defconfig
@@ -47,7 +47,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig
index 71a3707..2468571 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig
+++ b/boards/arm/stm32f7/stm32f746g-disco/configs/fb/defconfig
@@ -36,7 +36,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig
index 49bf0c2..917a14f 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig
+++ b/boards/arm/stm32f7/stm32f746g-disco/configs/netnsh/defconfig
@@ -48,7 +48,6 @@ CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig
index 3f47153..35655d4 100644
--- a/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32f7/stm32f746g-disco/configs/nsh/defconfig
@@ -30,7 +30,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig
index e6722f6..dde49ba 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig
+++ b/boards/arm/stm32f7/stm32f769i-disco/configs/netnsh/defconfig
@@ -45,7 +45,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig b/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig
index 84440cc..59aaf52 100644
--- a/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32f7/stm32f769i-disco/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/elf/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/elf/defconfig
index f6f8068..2d9fb75 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/configs/elf/defconfig
+++ b/boards/arm/stm32h7/nucleo-h743zi/configs/elf/defconfig
@@ -35,7 +35,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=4
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/netnsh/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/netnsh/defconfig
index a1107cf..dab8500 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/configs/netnsh/defconfig
+++ b/boards/arm/stm32h7/nucleo-h743zi/configs/netnsh/defconfig
@@ -49,7 +49,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig
index d0f8855..15e20f6 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig
+++ b/boards/arm/stm32h7/nucleo-h743zi/configs/nsh/defconfig
@@ -28,7 +28,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=4
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig
index 8c38126..f15b849 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig
+++ b/boards/arm/stm32h7/nucleo-h743zi/configs/nxlines_oled/defconfig
@@ -41,7 +41,6 @@ CONFIG_LCD_SSD1306_I2C=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=4
 CONFIG_MQ_MAXMSGSIZE=128
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/otg_fs_host/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/otg_fs_host/defconfig
index 5ff7526..406b548 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/configs/otg_fs_host/defconfig
+++ b/boards/arm/stm32h7/nucleo-h743zi/configs/otg_fs_host/defconfig
@@ -30,7 +30,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBM=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=4
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig b/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig
index 8a2b5a7..05c6125 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig
+++ b/boards/arm/stm32h7/nucleo-h743zi/configs/pwm/defconfig
@@ -28,7 +28,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=4
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig b/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig
index cdc9a42..3ba35b4 100644
--- a/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32h7/stm32h747i-disco/configs/nsh/defconfig
@@ -28,7 +28,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=4
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig
index 7dca9c2..6564e64 100644
--- a/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig
+++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MTD_SMART_SECTOR_SIZE=512
 CONFIG_MX25RXX_SECTOR512=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_LOSMART=y
diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig
index 735cae5..2ff1211 100644
--- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig
+++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-6lowpan/defconfig
@@ -64,7 +64,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig
index 77a4cd7..423eabb 100644
--- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig
+++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starhub/defconfig
@@ -55,7 +55,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
diff --git a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig
index 0cb8709..160122f 100644
--- a/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig
+++ b/boards/arm/stm32l4/b-l475e-iot01a/configs/spirit-starpoint/defconfig
@@ -66,7 +66,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_GET=y
diff --git a/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig
index 48fc295..2ba40e7 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig
+++ b/boards/arm/stm32l4/nucleo-l432kc/configs/nsh/defconfig
@@ -29,7 +29,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig b/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig
index 01f197e..c9e677d 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig
+++ b/boards/arm/stm32l4/nucleo-l432kc/configs/spwm/defconfig
@@ -27,7 +27,6 @@ CONFIG_LIBM=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUCLEOL432KC_SPWM=y
 CONFIG_NUCLEOL432KC_SPWM_PWM_FREQ=200000
 CONFIG_PREALLOC_TIMERS=4
diff --git a/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig
index 7bfad7f..bd13279 100644
--- a/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig
+++ b/boards/arm/stm32l4/nucleo-l452re/configs/nsh/defconfig
@@ -37,7 +37,6 @@ CONFIG_I2C=y
 CONFIG_I2C_RESET=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig
index 1598e7c..04c222d 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig
+++ b/boards/arm/stm32l4/nucleo-l476rg/configs/nsh/defconfig
@@ -29,7 +29,6 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig b/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig
index 5b35058..2168b33 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig
+++ b/boards/arm/stm32l4/nucleo-l476rg/configs/nxdemo/defconfig
@@ -34,7 +34,6 @@ CONFIG_LCD_PCD8544=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig b/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig
index bd4f970..e5e0570 100644
--- a/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig
+++ b/boards/arm/stm32l4/nucleo-l496zg/configs/nsh/defconfig
@@ -38,7 +38,6 @@ CONFIG_I2CTOOL_MINBUS=1
 CONFIG_I2C_RESET=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=2
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig
index dc2d584..a5cdffc 100644
--- a/boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig
+++ b/boards/arm/stm32l4/stm32l476-mdk/configs/nsh/defconfig
@@ -33,7 +33,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBM=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig
index 3a5a65c..37d88e2 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig
+++ b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/defconfig
@@ -38,7 +38,6 @@ CONFIG_MTD=y
 CONFIG_MTD_N25QXXX=y
 CONFIG_MTD_PARTITION=y
 CONFIG_N25QXXX_SECTOR512=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig
index 5820ca4..61a8b41 100644
--- a/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig
@@ -40,7 +40,6 @@ CONFIG_MTD=y
 CONFIG_MTD_N25QXXX=y
 CONFIG_MTD_PARTITION=y
 CONFIG_N25QXXX_SECTOR512=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig
index 379df92..dfea95c 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/defconfig
@@ -40,7 +40,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
 CONFIG_MTD=y
 CONFIG_MTD_PARTITION=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig
index 5127d8b..d371321 100644
--- a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig
+++ b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig
@@ -41,7 +41,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
 CONFIG_MTD=y
 CONFIG_MTD_PARTITION=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/arm/stm32l5/nucleo-l552ze/configs/nsh/defconfig b/boards/arm/stm32l5/nucleo-l552ze/configs/nsh/defconfig
index ef10d77..6cbb531 100644
--- a/boards/arm/stm32l5/nucleo-l552ze/configs/nsh/defconfig
+++ b/boards/arm/stm32l5/nucleo-l552ze/configs/nsh/defconfig
@@ -38,7 +38,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_INPUT=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/stm32l5/stm32l562e-dk/configs/nsh/defconfig b/boards/arm/stm32l5/stm32l562e-dk/configs/nsh/defconfig
index 7d6e5bc..8d41541 100644
--- a/boards/arm/stm32l5/stm32l562e-dk/configs/nsh/defconfig
+++ b/boards/arm/stm32l5/stm32l562e-dk/configs/nsh/defconfig
@@ -33,7 +33,6 @@ CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig b/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig
index 6b17f70..7e0f574 100644
--- a/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig
+++ b/boards/arm/str71x/olimex-strp711/configs/nettest/defconfig
@@ -31,7 +31,6 @@ CONFIG_NET_MAX_LISTENPORTS=8
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
-CONFIG_NFILE_DESCRIPTORS=24
 CONFIG_RAM_SIZE=65536
 CONFIG_RAM_START=0x20000000
 CONFIG_RAW_BINARY=y
diff --git a/boards/arm/str71x/olimex-strp711/configs/nsh/defconfig b/boards/arm/str71x/olimex-strp711/configs/nsh/defconfig
index b68eec9..6789aa5 100644
--- a/boards/arm/str71x/olimex-strp711/configs/nsh/defconfig
+++ b/boards/arm/str71x/olimex-strp711/configs/nsh/defconfig
@@ -21,7 +21,6 @@ CONFIG_FS_FAT=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig b/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig
index 276dc4a..98cfb37 100644
--- a/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig
+++ b/boards/arm/tiva/dk-tm4c129x/configs/ipv6/defconfig
@@ -44,7 +44,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig b/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig
index 8b8f406..a5e61d6 100644
--- a/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig
+++ b/boards/arm/tiva/dk-tm4c129x/configs/nsh/defconfig
@@ -46,7 +46,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/tiva/eagle100/configs/httpd/defconfig b/boards/arm/tiva/eagle100/configs/httpd/defconfig
index 54726db..0a46a7c 100644
--- a/boards/arm/tiva/eagle100/configs/httpd/defconfig
+++ b/boards/arm/tiva/eagle100/configs/httpd/defconfig
@@ -31,7 +31,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
-CONFIG_NFILE_DESCRIPTORS=24
 CONFIG_NUNGET_CHARS=0
 CONFIG_RAM_SIZE=65536
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/tiva/eagle100/configs/nettest/defconfig b/boards/arm/tiva/eagle100/configs/nettest/defconfig
index 8b70687..8475a0d 100644
--- a/boards/arm/tiva/eagle100/configs/nettest/defconfig
+++ b/boards/arm/tiva/eagle100/configs/nettest/defconfig
@@ -28,7 +28,6 @@ CONFIG_NET_ICMP=y
 CONFIG_NET_MAX_LISTENPORTS=8
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUNGET_CHARS=0
 CONFIG_RAM_SIZE=65536
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/tiva/eagle100/configs/nsh/defconfig b/boards/arm/tiva/eagle100/configs/nsh/defconfig
index 896f537..bd8783a 100644
--- a/boards/arm/tiva/eagle100/configs/nsh/defconfig
+++ b/boards/arm/tiva/eagle100/configs/nsh/defconfig
@@ -36,7 +36,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/tiva/eagle100/configs/nxflat/defconfig b/boards/arm/tiva/eagle100/configs/nxflat/defconfig
index 00db8d2..469b748 100644
--- a/boards/arm/tiva/eagle100/configs/nxflat/defconfig
+++ b/boards/arm/tiva/eagle100/configs/nxflat/defconfig
@@ -20,7 +20,6 @@ CONFIG_EXAMPLES_NXFLAT=y
 CONFIG_FS_ROMFS=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NXFLAT=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=65536
diff --git a/boards/arm/tiva/eagle100/configs/thttpd/defconfig b/boards/arm/tiva/eagle100/configs/thttpd/defconfig
index 1a5d6b0..a3965c2 100644
--- a/boards/arm/tiva/eagle100/configs/thttpd/defconfig
+++ b/boards/arm/tiva/eagle100/configs/thttpd/defconfig
@@ -31,7 +31,6 @@ CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
-CONFIG_NFILE_DESCRIPTORS=24
 CONFIG_NUNGET_CHARS=0
 CONFIG_NXFLAT=y
 CONFIG_PIPES=y
diff --git a/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig b/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig
index dcc6db9..e9f00df 100644
--- a/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig
+++ b/boards/arm/tiva/ekk-lm3s9b96/configs/nsh/defconfig
@@ -36,7 +36,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=48
 CONFIG_NFS=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/tiva/launchxl-cc1310/configs/nsh/defconfig b/boards/arm/tiva/launchxl-cc1310/configs/nsh/defconfig
index d3a2b9f..c2c092e 100644
--- a/boards/arm/tiva/launchxl-cc1310/configs/nsh/defconfig
+++ b/boards/arm/tiva/launchxl-cc1310/configs/nsh/defconfig
@@ -24,7 +24,6 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_FS_PROCFS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/tiva/launchxl-cc1312r1/configs/nsh/defconfig b/boards/arm/tiva/launchxl-cc1312r1/configs/nsh/defconfig
index cf46abd..db53e95 100644
--- a/boards/arm/tiva/launchxl-cc1312r1/configs/nsh/defconfig
+++ b/boards/arm/tiva/launchxl-cc1312r1/configs/nsh/defconfig
@@ -25,7 +25,6 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_FS_PROCFS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig b/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig
index cfa2a14..e7836ac 100644
--- a/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig
+++ b/boards/arm/tiva/lm3s6432-s2e/configs/nsh/defconfig
@@ -32,7 +32,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig
index 4ed885f..273a76f 100644
--- a/boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig
+++ b/boards/arm/tiva/lm3s6965-ek/configs/discover/defconfig
@@ -43,7 +43,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig
index d3c2eb2..e647bce 100644
--- a/boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig
+++ b/boards/arm/tiva/lm3s6965-ek/configs/nsh/defconfig
@@ -39,7 +39,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig
index 4d54d06..ed754c6 100644
--- a/boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig
+++ b/boards/arm/tiva/lm3s6965-ek/configs/nx/defconfig
@@ -33,7 +33,6 @@ CONFIG_LCD=y
 CONFIG_LCD_P14201=y
 CONFIG_MAX_TASKS=16
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=12
 CONFIG_NX=y
 CONFIG_NXFONT_SANS23X27=y
 CONFIG_NXSTART_EXTERNINIT=y
diff --git a/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig
index 260d971..5ad9f94 100644
--- a/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig
+++ b/boards/arm/tiva/lm3s6965-ek/configs/qemu-flat/defconfig
@@ -64,7 +64,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig
index af5ce4e..2e37995 100644
--- a/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig
+++ b/boards/arm/tiva/lm3s6965-ek/configs/qemu-protected/defconfig
@@ -67,7 +67,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig b/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig
index 3584630..7d4ebca 100644
--- a/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig
+++ b/boards/arm/tiva/lm3s6965-ek/configs/tcpecho/defconfig
@@ -41,7 +41,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=24
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=65536
 CONFIG_RAM_START=0x20000000
diff --git a/boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig b/boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig
index 26c3d0c..a3c4b70 100644
--- a/boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig
+++ b/boards/arm/tiva/lm3s8962-ek/configs/nsh/defconfig
@@ -38,7 +38,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig b/boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig
index ac02dcc..9ffb503 100644
--- a/boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig
+++ b/boards/arm/tiva/lm3s8962-ek/configs/nx/defconfig
@@ -33,7 +33,6 @@ CONFIG_LCD=y
 CONFIG_LCD_P14201=y
 CONFIG_MAX_TASKS=16
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=12
 CONFIG_NX=y
 CONFIG_NXFONT_SANS23X27=y
 CONFIG_NXSTART_EXTERNINIT=y
diff --git a/boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig b/boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig
index e131a50..ac18caa 100644
--- a/boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig
+++ b/boards/arm/tiva/lm4f120-launchpad/configs/nsh/defconfig
@@ -21,7 +21,6 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 CONFIG_BOARD_LOOPSPERMSEC=4531
 CONFIG_BUILTIN=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/arm/tiva/tm4c123g-launchpad/configs/mcp2515/defconfig b/boards/arm/tiva/tm4c123g-launchpad/configs/mcp2515/defconfig
index fa40249..46fc767 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/configs/mcp2515/defconfig
+++ b/boards/arm/tiva/tm4c123g-launchpad/configs/mcp2515/defconfig
@@ -30,7 +30,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MCP2515_PHASESEG1=3
 CONFIG_MCP2515_PROPSEG=1
 CONFIG_MCP2515_SPI_SCK_FREQUENCY=4000000
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig b/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig
index 171a818..ea055f3 100644
--- a/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig
+++ b/boards/arm/tiva/tm4c123g-launchpad/configs/nsh/defconfig
@@ -22,7 +22,6 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 CONFIG_BOARD_LOOPSPERMSEC=4531
 CONFIG_BUILTIN=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig b/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig
index 8a2f716..53be6bd 100644
--- a/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig
+++ b/boards/arm/tiva/tm4c1294-launchpad/configs/ipv6/defconfig
@@ -43,7 +43,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig b/boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig
index b65eee4..369e0c0 100644
--- a/boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig
+++ b/boards/arm/tiva/tm4c1294-launchpad/configs/nsh/defconfig
@@ -44,7 +44,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/tms570/launchxl-tms57004/configs/nsh/defconfig b/boards/arm/tms570/launchxl-tms57004/configs/nsh/defconfig
index 46f8099..c2203ae 100644
--- a/boards/arm/tms570/launchxl-tms57004/configs/nsh/defconfig
+++ b/boards/arm/tms570/launchxl-tms57004/configs/nsh/defconfig
@@ -26,7 +26,6 @@ CONFIG_FS_PROCFS=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_I2C=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig b/boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig
index 0a79849..e5236bb 100644
--- a/boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig
+++ b/boards/arm/tms570/tms570ls31x-usb-kit/configs/nsh/defconfig
@@ -26,7 +26,6 @@ CONFIG_FS_PROCFS=y
 CONFIG_I2C=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/xmc4/xmc4500-relax/configs/nsh/defconfig b/boards/arm/xmc4/xmc4500-relax/configs/nsh/defconfig
index 6e16c74..d42b5c1 100644
--- a/boards/arm/xmc4/xmc4500-relax/configs/nsh/defconfig
+++ b/boards/arm/xmc4/xmc4500-relax/configs/nsh/defconfig
@@ -39,7 +39,6 @@ CONFIG_MTD=y
 CONFIG_MTD_AT24XX=y
 CONFIG_MTD_AT25=y
 CONFIG_MTD_CONFIG=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/arm/xmc4/xmc4700-relax/configs/nsh/defconfig b/boards/arm/xmc4/xmc4700-relax/configs/nsh/defconfig
index 4bc4b33..94fa0bd 100644
--- a/boards/arm/xmc4/xmc4700-relax/configs/nsh/defconfig
+++ b/boards/arm/xmc4/xmc4700-relax/configs/nsh/defconfig
@@ -22,7 +22,6 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_NOOPT=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig b/boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig
index b84cfc3..2380c2d 100644
--- a/boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig
+++ b/boards/avr/at32uc3/avr32dev1/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_FS_FAT=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
diff --git a/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig b/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig
index 3661fce..2764db4 100644
--- a/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig
+++ b/boards/avr/at32uc3/avr32dev1/configs/ostest/defconfig
@@ -27,7 +27,6 @@ CONFIG_ENDIAN_BIG=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=32768
 CONFIG_RAM_START=0x00000000
diff --git a/boards/avr/at90usb/micropendous3/configs/hello/defconfig b/boards/avr/at90usb/micropendous3/configs/hello/defconfig
index e48d059..2f0ea2c 100644
--- a/boards/avr/at90usb/micropendous3/configs/hello/defconfig
+++ b/boards/avr/at90usb/micropendous3/configs/hello/defconfig
@@ -25,7 +25,7 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_IDLETHREAD_STACKSIZE=512
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=4
-CONFIG_NFILE_DESCRIPTORS=4
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=1024
diff --git a/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig b/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig
index df700c0..0b2e790 100644
--- a/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig
+++ b/boards/avr/at90usb/teensy-2.0/configs/hello/defconfig
@@ -25,7 +25,7 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_IDLETHREAD_STACKSIZE=512
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=4
-CONFIG_NFILE_DESCRIPTORS=4
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=1024
diff --git a/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig b/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig
index ce37032..0c0cf9a 100644
--- a/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig
+++ b/boards/avr/at90usb/teensy-2.0/configs/nsh/defconfig
@@ -27,7 +27,7 @@ CONFIG_DISABLE_PTHREAD=y
 CONFIG_IDLETHREAD_STACKSIZE=512
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=512
diff --git a/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig
index f6c09d4..3b49fb2 100644
--- a/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig
+++ b/boards/avr/at90usb/teensy-2.0/configs/usbmsc/defconfig
@@ -28,7 +28,7 @@ CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=8
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPICLOCK=12500000
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=512
diff --git a/boards/avr/atmega/amber/configs/hello/defconfig b/boards/avr/atmega/amber/configs/hello/defconfig
index 26d9fec..3d6793c 100644
--- a/boards/avr/atmega/amber/configs/hello/defconfig
+++ b/boards/avr/atmega/amber/configs/hello/defconfig
@@ -25,7 +25,7 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_IDLETHREAD_STACKSIZE=512
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=4
-CONFIG_NFILE_DESCRIPTORS=4
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=1024
diff --git a/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig b/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig
index 05aeb94..eebada1 100644
--- a/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig
+++ b/boards/avr/atmega/arduino-mega2560/configs/hello/defconfig
@@ -27,7 +27,7 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_IDLETHREAD_STACKSIZE=128
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=4
-CONFIG_NFILE_DESCRIPTORS=4
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=128
diff --git a/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig b/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig
index 8aa654e..d6c4bc0 100644
--- a/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig
+++ b/boards/avr/atmega/arduino-mega2560/configs/nsh/defconfig
@@ -25,7 +25,7 @@ CONFIG_DISABLE_PTHREAD=y
 CONFIG_IDLETHREAD_STACKSIZE=128
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=4
-CONFIG_NFILE_DESCRIPTORS=4
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4
 CONFIG_NUNGET_CHARS=0
 CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=512
 CONFIG_PREALLOC_TIMERS=0
diff --git a/boards/avr/atmega/moteino-mega/configs/hello/defconfig b/boards/avr/atmega/moteino-mega/configs/hello/defconfig
index 6d7c081..d7af2c5 100644
--- a/boards/avr/atmega/moteino-mega/configs/hello/defconfig
+++ b/boards/avr/atmega/moteino-mega/configs/hello/defconfig
@@ -25,7 +25,7 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_IDLETHREAD_STACKSIZE=512
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=4
-CONFIG_NFILE_DESCRIPTORS=4
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=512
diff --git a/boards/avr/atmega/moteino-mega/configs/nsh/defconfig b/boards/avr/atmega/moteino-mega/configs/nsh/defconfig
index d303047..85b844e 100644
--- a/boards/avr/atmega/moteino-mega/configs/nsh/defconfig
+++ b/boards/avr/atmega/moteino-mega/configs/nsh/defconfig
@@ -27,7 +27,7 @@ CONFIG_DISABLE_PTHREAD=y
 CONFIG_IDLETHREAD_STACKSIZE=512
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=512
diff --git a/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig b/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig
index f58baef..83c0282 100644
--- a/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig
+++ b/boards/hc/m9s12/demo9s12ne64/configs/ostest/defconfig
@@ -27,7 +27,7 @@ CONFIG_HCS12_SERIALMON=y
 CONFIG_IDLETHREAD_STACKSIZE=256
 CONFIG_MAX_TASKS=8
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=3
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=3
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=256
diff --git a/boards/hc/m9s12/ne64badge/configs/ostest/defconfig b/boards/hc/m9s12/ne64badge/configs/ostest/defconfig
index 14670d7..6846916 100644
--- a/boards/hc/m9s12/ne64badge/configs/ostest/defconfig
+++ b/boards/hc/m9s12/ne64badge/configs/ostest/defconfig
@@ -26,7 +26,7 @@ CONFIG_HCS12_SCI0=y
 CONFIG_IDLETHREAD_STACKSIZE=256
 CONFIG_MAX_TASKS=8
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=3
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=3
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=256
diff --git a/boards/mips/pic32mx/mirtoo/configs/nsh/defconfig b/boards/mips/pic32mx/mirtoo/configs/nsh/defconfig
index d10c0eb..502e8f9 100644
--- a/boards/mips/pic32mx/mirtoo/configs/nsh/defconfig
+++ b/boards/mips/pic32mx/mirtoo/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PIC32MX_DEBUGGER=1
 CONFIG_PIC32MX_ICESEL=2
 CONFIG_PIC32MX_OSCOUT=1
diff --git a/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig b/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig
index 9712b62..12d9017 100644
--- a/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig
+++ b/boards/mips/pic32mx/mirtoo/configs/nxffs/defconfig
@@ -32,7 +32,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MIPS32_TOOLCHAIN_PINGUINOW=y
 CONFIG_MTD=y
 CONFIG_MTD_SST25=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_DISABLE_KILL=y
 CONFIG_NSH_DISABLE_SOURCE=y
diff --git a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig
index 5319097..e8774df 100644
--- a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig
+++ b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh/defconfig
@@ -28,7 +28,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MTD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig
index 3542fcf..b9d2b46 100644
--- a/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig
+++ b/boards/mips/pic32mx/pic32mx-starterkit/configs/nsh2/defconfig
@@ -48,7 +48,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig b/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig
index 78a8452..f5df7f5 100644
--- a/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig
+++ b/boards/mips/pic32mx/pic32mx7mmb/configs/nsh/defconfig
@@ -50,7 +50,6 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig b/boards/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig
index c7f707d..964d0c5 100644
--- a/boards/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig
+++ b/boards/mips/pic32mx/sure-pic32mx/configs/nsh/defconfig
@@ -23,7 +23,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig b/boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig
index 89baad6..0d14af9 100644
--- a/boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig
+++ b/boards/mips/pic32mx/sure-pic32mx/configs/usbnsh/defconfig
@@ -29,7 +29,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/mips/pic32mx/ubw32/configs/nsh/defconfig b/boards/mips/pic32mx/ubw32/configs/nsh/defconfig
index b0bb539..6685257 100644
--- a/boards/mips/pic32mx/ubw32/configs/nsh/defconfig
+++ b/boards/mips/pic32mx/ubw32/configs/nsh/defconfig
@@ -29,7 +29,6 @@ CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig
index 60a982b..33a0b2f 100644
--- a/boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig
+++ b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nsh/defconfig
@@ -29,7 +29,6 @@ CONFIG_MIPS32_TOOLCHAIN_PINGUINOW=y
 CONFIG_MIPS_MICROMIPS=y
 CONFIG_MMCSD=y
 CONFIG_MTD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig
index f7fb292..ab84184 100644
--- a/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig
+++ b/boards/mips/pic32mz/flipnclick-pic32mz/configs/nxlines/defconfig
@@ -36,7 +36,6 @@ CONFIG_MIPS_MICROMIPS=y
 CONFIG_MMCSD=y
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_MTD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig b/boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig
index 1fa82f0..db416ec 100644
--- a/boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig
+++ b/boards/mips/pic32mz/pic32mz-starterkit/configs/nsh/defconfig
@@ -30,7 +30,6 @@ CONFIG_MIPS32_TOOLCHAIN_PINGUINOW=y
 CONFIG_MIPS_MICROMIPS=y
 CONFIG_MMCSD=y
 CONFIG_MTD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/misoc/lm32/misoc/configs/hello/defconfig b/boards/misoc/lm32/misoc/configs/hello/defconfig
index 45df087..10a39a8 100644
--- a/boards/misoc/lm32/misoc/configs/hello/defconfig
+++ b/boards/misoc/lm32/misoc/configs/hello/defconfig
@@ -63,7 +63,7 @@ CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=4
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=67108864
diff --git a/boards/misoc/lm32/misoc/configs/nsh/defconfig b/boards/misoc/lm32/misoc/configs/nsh/defconfig
index 7696374..722ab92 100644
--- a/boards/misoc/lm32/misoc/configs/nsh/defconfig
+++ b/boards/misoc/lm32/misoc/configs/nsh/defconfig
@@ -54,7 +54,7 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_MAX_TASKS=4
 CONFIG_MISOC_UART1=y
-CONFIG_NFILE_DESCRIPTORS=4
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=4
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
 CONFIG_NUNGET_CHARS=0
diff --git a/boards/or1k/mor1kx/or1k/configs/nsh/defconfig b/boards/or1k/mor1kx/or1k/configs/nsh/defconfig
index 2c56dfa..edf38f8 100644
--- a/boards/or1k/mor1kx/or1k/configs/nsh/defconfig
+++ b/boards/or1k/mor1kx/or1k/configs/nsh/defconfig
@@ -69,7 +69,6 @@ CONFIG_EXPERIMENTAL=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_PROCFS_REGISTER=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/renesas/m16c/skp16c26/configs/ostest/defconfig b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig
index fd887f4..1786373 100644
--- a/boards/renesas/m16c/skp16c26/configs/ostest/defconfig
+++ b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig
@@ -23,7 +23,6 @@ CONFIG_ENDIAN_BIG=y
 CONFIG_IDLETHREAD_STACKSIZE=256
 CONFIG_MAX_TASKS=8
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=256
diff --git a/boards/renesas/rx65n/rx65n-grrose/configs/ipv6/defconfig b/boards/renesas/rx65n/rx65n-grrose/configs/ipv6/defconfig
index abf847b..bd5eb44 100644
--- a/boards/renesas/rx65n/rx65n-grrose/configs/ipv6/defconfig
+++ b/boards/renesas/rx65n/rx65n-grrose/configs/ipv6/defconfig
@@ -44,7 +44,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/renesas/rx65n/rx65n-grrose/configs/netnsh/defconfig b/boards/renesas/rx65n/rx65n-grrose/configs/netnsh/defconfig
index 972354c..fb8f9a7 100644
--- a/boards/renesas/rx65n/rx65n-grrose/configs/netnsh/defconfig
+++ b/boards/renesas/rx65n/rx65n-grrose/configs/netnsh/defconfig
@@ -43,7 +43,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/renesas/rx65n/rx65n-grrose/configs/nsh/defconfig b/boards/renesas/rx65n/rx65n-grrose/configs/nsh/defconfig
index cc4db59..ce9f3e5 100644
--- a/boards/renesas/rx65n/rx65n-grrose/configs/nsh/defconfig
+++ b/boards/renesas/rx65n/rx65n-grrose/configs/nsh/defconfig
@@ -18,7 +18,6 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_FEATURES=y
 CONFIG_MAX_TASKS=8
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/renesas/rx65n/rx65n-rsk1mb/configs/netnsh/defconfig b/boards/renesas/rx65n/rx65n-rsk1mb/configs/netnsh/defconfig
index a08c47a..8504743 100644
--- a/boards/renesas/rx65n/rx65n-rsk1mb/configs/netnsh/defconfig
+++ b/boards/renesas/rx65n/rx65n-rsk1mb/configs/netnsh/defconfig
@@ -36,7 +36,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/renesas/rx65n/rx65n-rsk1mb/configs/nsh/defconfig b/boards/renesas/rx65n/rx65n-rsk1mb/configs/nsh/defconfig
index 62bf57b..ee25eea 100644
--- a/boards/renesas/rx65n/rx65n-rsk1mb/configs/nsh/defconfig
+++ b/boards/renesas/rx65n/rx65n-rsk1mb/configs/nsh/defconfig
@@ -19,7 +19,6 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_FEATURES=y
 CONFIG_MAX_TASKS=8
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/configs/ipv6/defconfig b/boards/renesas/rx65n/rx65n-rsk2mb/configs/ipv6/defconfig
index f318501..03472a0 100644
--- a/boards/renesas/rx65n/rx65n-rsk2mb/configs/ipv6/defconfig
+++ b/boards/renesas/rx65n/rx65n-rsk2mb/configs/ipv6/defconfig
@@ -44,7 +44,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/configs/netnsh/defconfig b/boards/renesas/rx65n/rx65n-rsk2mb/configs/netnsh/defconfig
index f8c2b2f..31abe50 100644
--- a/boards/renesas/rx65n/rx65n-rsk2mb/configs/netnsh/defconfig
+++ b/boards/renesas/rx65n/rx65n-rsk2mb/configs/netnsh/defconfig
@@ -43,7 +43,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/configs/nsh/defconfig b/boards/renesas/rx65n/rx65n-rsk2mb/configs/nsh/defconfig
index 73de08d..1b5eb83 100644
--- a/boards/renesas/rx65n/rx65n-rsk2mb/configs/nsh/defconfig
+++ b/boards/renesas/rx65n/rx65n-rsk2mb/configs/nsh/defconfig
@@ -20,7 +20,6 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_FEATURES=y
 CONFIG_MAX_TASKS=8
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/renesas/rx65n/rx65n/configs/nsh/defconfig b/boards/renesas/rx65n/rx65n/configs/nsh/defconfig
index c38caf2..af38345 100644
--- a/boards/renesas/rx65n/rx65n/configs/nsh/defconfig
+++ b/boards/renesas/rx65n/rx65n/configs/nsh/defconfig
@@ -20,7 +20,6 @@ CONFIG_DEBUG_SYMBOLS=y
 CONFIG_ARCH_INTERRUPTSTACK=1024
 CONFIG_BUILTIN=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
diff --git a/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig b/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig
index aba8aa8..9fe8013 100644
--- a/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig
+++ b/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig
@@ -23,7 +23,6 @@ CONFIG_DISABLE_PTHREAD=y
 CONFIG_ENDIAN_BIG=y
 CONFIG_MAX_TASKS=8
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
diff --git a/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig b/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig
index b00e531..2085e89 100644
--- a/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig
+++ b/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig
@@ -23,7 +23,6 @@ CONFIG_DISABLE_PTHREAD=y
 CONFIG_ENDIAN_BIG=y
 CONFIG_MAX_TASKS=8
 CONFIG_MOTOROLA_SREC=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=1024
diff --git a/boards/risc-v/bl602/bl602evb/configs/elf/defconfig b/boards/risc-v/bl602/bl602evb/configs/elf/defconfig
index e55f7bc..6fe7075 100644
--- a/boards/risc-v/bl602/bl602evb/configs/elf/defconfig
+++ b/boards/risc-v/bl602/bl602evb/configs/elf/defconfig
@@ -40,7 +40,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
diff --git a/boards/risc-v/bl602/bl602evb/configs/fpu/defconfig b/boards/risc-v/bl602/bl602evb/configs/fpu/defconfig
index dd241f7..07e3224 100644
--- a/boards/risc-v/bl602/bl602evb/configs/fpu/defconfig
+++ b/boards/risc-v/bl602/bl602evb/configs/fpu/defconfig
@@ -36,7 +36,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
diff --git a/boards/risc-v/bl602/bl602evb/configs/gpio/defconfig b/boards/risc-v/bl602/bl602evb/configs/gpio/defconfig
index 14381d8..9ea5929 100644
--- a/boards/risc-v/bl602/bl602evb/configs/gpio/defconfig
+++ b/boards/risc-v/bl602/bl602evb/configs/gpio/defconfig
@@ -38,7 +38,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
diff --git a/boards/risc-v/bl602/bl602evb/configs/i2c/defconfig b/boards/risc-v/bl602/bl602evb/configs/i2c/defconfig
index 1542c50..340afb6 100644
--- a/boards/risc-v/bl602/bl602evb/configs/i2c/defconfig
+++ b/boards/risc-v/bl602/bl602evb/configs/i2c/defconfig
@@ -38,7 +38,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
diff --git a/boards/risc-v/bl602/bl602evb/configs/nsh/defconfig b/boards/risc-v/bl602/bl602evb/configs/nsh/defconfig
index d624275..d2a8e7e 100644
--- a/boards/risc-v/bl602/bl602evb/configs/nsh/defconfig
+++ b/boards/risc-v/bl602/bl602evb/configs/nsh/defconfig
@@ -36,7 +36,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
diff --git a/boards/risc-v/bl602/bl602evb/configs/spi/defconfig b/boards/risc-v/bl602/bl602evb/configs/spi/defconfig
index e7b198a..60d181a 100644
--- a/boards/risc-v/bl602/bl602evb/configs/spi/defconfig
+++ b/boards/risc-v/bl602/bl602evb/configs/spi/defconfig
@@ -37,7 +37,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
diff --git a/boards/risc-v/bl602/bl602evb/configs/spiflash/defconfig b/boards/risc-v/bl602/bl602evb/configs/spiflash/defconfig
index 96ef146..4ea53df 100644
--- a/boards/risc-v/bl602/bl602evb/configs/spiflash/defconfig
+++ b/boards/risc-v/bl602/bl602evb/configs/spiflash/defconfig
@@ -38,7 +38,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
diff --git a/boards/risc-v/bl602/bl602evb/configs/timer/defconfig b/boards/risc-v/bl602/bl602evb/configs/timer/defconfig
index 94d6325..3910f84 100644
--- a/boards/risc-v/bl602/bl602evb/configs/timer/defconfig
+++ b/boards/risc-v/bl602/bl602evb/configs/timer/defconfig
@@ -39,7 +39,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/bmp180/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/bmp180/defconfig
index 052632b..beecb82 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/bmp180/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/bmp180/defconfig
@@ -28,7 +28,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/gpio/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/gpio/defconfig
index feca198..e70b12c 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/gpio/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/gpio/defconfig
@@ -29,7 +29,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/nsh/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/nsh/defconfig
index 384df3e..c9f1343 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/nsh/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/nsh/defconfig
@@ -26,7 +26,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/timer/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/timer/defconfig
index 8f4759b..6d624c9 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/timer/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/timer/defconfig
@@ -29,7 +29,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/wapi/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/wapi/defconfig
index c925394..5ba6b7b 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/wapi/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/wapi/defconfig
@@ -39,7 +39,6 @@ CONFIG_NET_ICMP_SOCKET=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/watchdog/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/watchdog/defconfig
index 67bda48..3897255 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/watchdog/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/watchdog/defconfig
@@ -29,7 +29,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/configs/watcher/defconfig b/boards/risc-v/esp32c3/esp32c3-devkit/configs/watcher/defconfig
index 881af55..a15584f 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/configs/watcher/defconfig
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/configs/watcher/defconfig
@@ -31,7 +31,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/risc-v/fe310/hifive1-revb/configs/nsh/defconfig b/boards/risc-v/fe310/hifive1-revb/configs/nsh/defconfig
index c5ccc6c..1d8c43a 100644
--- a/boards/risc-v/fe310/hifive1-revb/configs/nsh/defconfig
+++ b/boards/risc-v/fe310/hifive1-revb/configs/nsh/defconfig
@@ -45,7 +45,7 @@ CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
 CONFIG_MM_SMALL=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
diff --git a/boards/risc-v/k210/maix-bit/configs/smp/defconfig b/boards/risc-v/k210/maix-bit/configs/smp/defconfig
index d48d7fa..dac33bc 100644
--- a/boards/risc-v/k210/maix-bit/configs/smp/defconfig
+++ b/boards/risc-v/k210/maix-bit/configs/smp/defconfig
@@ -30,7 +30,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/risc-v/litex/arty_a7/configs/nsh/defconfig b/boards/risc-v/litex/arty_a7/configs/nsh/defconfig
index 3d50afc..26d03ea 100644
--- a/boards/risc-v/litex/arty_a7/configs/nsh/defconfig
+++ b/boards/risc-v/litex/arty_a7/configs/nsh/defconfig
@@ -33,7 +33,7 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_CD=y
diff --git a/boards/sim/sim/sim/configs/alsa/defconfig b/boards/sim/sim/sim/configs/alsa/defconfig
index 542e43c..063d663 100644
--- a/boards/sim/sim/sim/configs/alsa/defconfig
+++ b/boards/sim/sim/sim/configs/alsa/defconfig
@@ -34,7 +34,6 @@ CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/sim/sim/sim/configs/bas/defconfig b/boards/sim/sim/sim/configs/bas/defconfig
index cc32f04..6fed61d 100644
--- a/boards/sim/sim/sim/configs/bas/defconfig
+++ b/boards/sim/sim/sim/configs/bas/defconfig
@@ -26,7 +26,6 @@ CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBM=y
 CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FATDEVNO=2
diff --git a/boards/sim/sim/sim/configs/bluetooth/defconfig b/boards/sim/sim/sim/configs/bluetooth/defconfig
index dfd3dbc..7974ba2 100644
--- a/boards/sim/sim/sim/configs/bluetooth/defconfig
+++ b/boards/sim/sim/sim/configs/bluetooth/defconfig
@@ -45,7 +45,6 @@ CONFIG_NETDEV_WIRELESS_IOCTL=y
 CONFIG_NETINIT_NETLOCAL=y
 CONFIG_NET_BLUETOOTH=y
 CONFIG_NET_STATISTICS=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/sim/sim/sim/configs/bthcisock/defconfig b/boards/sim/sim/sim/configs/bthcisock/defconfig
index eb7d1c9..bb2ac21 100644
--- a/boards/sim/sim/sim/configs/bthcisock/defconfig
+++ b/boards/sim/sim/sim/configs/bthcisock/defconfig
@@ -46,7 +46,6 @@ CONFIG_NETDEV_WIRELESS_IOCTL=y
 CONFIG_NETINIT_NETLOCAL=y
 CONFIG_NET_BLUETOOTH=y
 CONFIG_NET_STATISTICS=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/sim/sim/sim/configs/btuart/defconfig b/boards/sim/sim/sim/configs/btuart/defconfig
index 77c86fe..b4e2f25 100644
--- a/boards/sim/sim/sim/configs/btuart/defconfig
+++ b/boards/sim/sim/sim/configs/btuart/defconfig
@@ -47,7 +47,6 @@ CONFIG_NETDEV_WIRELESS_IOCTL=y
 CONFIG_NETINIT_NETLOCAL=y
 CONFIG_NET_BLUETOOTH=y
 CONFIG_NET_STATISTICS=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/sim/sim/sim/configs/configdata/defconfig b/boards/sim/sim/sim/configs/configdata/defconfig
index cf831cc..0b634e1 100644
--- a/boards/sim/sim/sim/configs/configdata/defconfig
+++ b/boards/sim/sim/sim/configs/configdata/defconfig
@@ -25,7 +25,6 @@ CONFIG_MAX_TASKS=64
 CONFIG_MTD=y
 CONFIG_MTD_BYTE_WRITE=y
 CONFIG_MTD_CONFIG=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_PLATFORM_CONFIGDATA=y
 CONFIG_RAMMTD=y
 CONFIG_RAMMTD_BLOCKSIZE=256
diff --git a/boards/sim/sim/sim/configs/cxxtest/defconfig b/boards/sim/sim/sim/configs/cxxtest/defconfig
index 217551a..a286b7f 100644
--- a/boards/sim/sim/sim/configs/cxxtest/defconfig
+++ b/boards/sim/sim/sim/configs/cxxtest/defconfig
@@ -16,7 +16,6 @@ CONFIG_HAVE_CXX=y
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_LIBM=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_PTHREAD_MUTEX_TYPES=y
 CONFIG_RAM_START=0x00000000
 CONFIG_SCHED_ONEXIT=y
diff --git a/boards/sim/sim/sim/configs/dsptest/defconfig b/boards/sim/sim/sim/configs/dsptest/defconfig
index 8084a46..79ef7a4 100644
--- a/boards/sim/sim/sim/configs/dsptest/defconfig
+++ b/boards/sim/sim/sim/configs/dsptest/defconfig
@@ -25,7 +25,6 @@ CONFIG_LIBM=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=64
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_SCHED_WAITPID=y
 CONFIG_SDCLONE_DISABLE=y
 CONFIG_START_DAY=6
diff --git a/boards/sim/sim/sim/configs/duktape/defconfig b/boards/sim/sim/sim/configs/duktape/defconfig
index 58ccbd3..3033ad8 100644
--- a/boards/sim/sim/sim/configs/duktape/defconfig
+++ b/boards/sim/sim/sim/configs/duktape/defconfig
@@ -35,7 +35,6 @@ CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBM=y
 CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/sim/sim/sim/configs/ipforward/defconfig b/boards/sim/sim/sim/configs/ipforward/defconfig
index fbb880b..f4462c9 100644
--- a/boards/sim/sim/sim/configs/ipforward/defconfig
+++ b/boards/sim/sim/sim/configs/ipforward/defconfig
@@ -45,7 +45,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_TUN=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/sim/sim/sim/configs/libcxxtest/defconfig b/boards/sim/sim/sim/configs/libcxxtest/defconfig
index 19d6155..74c295a 100644
--- a/boards/sim/sim/sim/configs/libcxxtest/defconfig
+++ b/boards/sim/sim/sim/configs/libcxxtest/defconfig
@@ -73,7 +73,6 @@ CONFIG_NET_TCP_NOTIFIER=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_NOTIFIER=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/sim/sim/sim/configs/linuxi2c/defconfig b/boards/sim/sim/sim/configs/linuxi2c/defconfig
index 43a1c82..e0e6708 100644
--- a/boards/sim/sim/sim/configs/linuxi2c/defconfig
+++ b/boards/sim/sim/sim/configs/linuxi2c/defconfig
@@ -24,7 +24,6 @@ CONFIG_FS_PROCFS=y
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
diff --git a/boards/sim/sim/sim/configs/minibasic/defconfig b/boards/sim/sim/sim/configs/minibasic/defconfig
index 16e1b3d..f870c19 100644
--- a/boards/sim/sim/sim/configs/minibasic/defconfig
+++ b/boards/sim/sim/sim/configs/minibasic/defconfig
@@ -33,7 +33,6 @@ CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBM=y
 CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/sim/sim/sim/configs/module/defconfig b/boards/sim/sim/sim/configs/module/defconfig
index e656fb9..60eca11 100644
--- a/boards/sim/sim/sim/configs/module/defconfig
+++ b/boards/sim/sim/sim/configs/module/defconfig
@@ -56,7 +56,6 @@ CONFIG_NET_TCP_NOTIFIER=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_NOTIFIER=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_LINELEN=200
diff --git a/boards/sim/sim/sim/configs/module32/defconfig b/boards/sim/sim/sim/configs/module32/defconfig
index b59c344..3d6d7cd 100644
--- a/boards/sim/sim/sim/configs/module32/defconfig
+++ b/boards/sim/sim/sim/configs/module32/defconfig
@@ -56,7 +56,6 @@ CONFIG_NET_TCP_NOTIFIER=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_NOTIFIER=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_LINELEN=200
diff --git a/boards/sim/sim/sim/configs/mount/defconfig b/boards/sim/sim/sim/configs/mount/defconfig
index 9e5c3bc..917fb23 100644
--- a/boards/sim/sim/sim/configs/mount/defconfig
+++ b/boards/sim/sim/sim/configs/mount/defconfig
@@ -17,7 +17,6 @@ CONFIG_EXAMPLES_MOUNT_DEVNAME="/dev/ram0"
 CONFIG_FS_FAT=y
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_SDCLONE_DISABLE=y
 CONFIG_START_MONTH=6
 CONFIG_START_YEAR=2008
diff --git a/boards/sim/sim/sim/configs/mtdpart/defconfig b/boards/sim/sim/sim/configs/mtdpart/defconfig
index 084a38c..1a7f588 100644
--- a/boards/sim/sim/sim/configs/mtdpart/defconfig
+++ b/boards/sim/sim/sim/configs/mtdpart/defconfig
@@ -21,7 +21,6 @@ CONFIG_LIB_RAND_ORDER=3
 CONFIG_MAX_TASKS=64
 CONFIG_MTD=y
 CONFIG_MTD_PARTITION=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_RAMMTD=y
 CONFIG_RAMMTD_FLASHSIM=y
 CONFIG_SDCLONE_DISABLE=y
diff --git a/boards/sim/sim/sim/configs/mtdrwb/defconfig b/boards/sim/sim/sim/configs/mtdrwb/defconfig
index 9b633af..b81bb16 100644
--- a/boards/sim/sim/sim/configs/mtdrwb/defconfig
+++ b/boards/sim/sim/sim/configs/mtdrwb/defconfig
@@ -24,7 +24,6 @@ CONFIG_MTD=y
 CONFIG_MTD_PARTITION=y
 CONFIG_MTD_READAHEAD=y
 CONFIG_MTD_WRBUFFER=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_RAMMTD=y
 CONFIG_RAMMTD_FLASHSIM=y
 CONFIG_SCHED_HPWORK=y
diff --git a/boards/sim/sim/sim/configs/nettest/defconfig b/boards/sim/sim/sim/configs/nettest/defconfig
index 1e961d7..087641f 100644
--- a/boards/sim/sim/sim/configs/nettest/defconfig
+++ b/boards/sim/sim/sim/configs/nettest/defconfig
@@ -25,7 +25,6 @@ CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_SDCLONE_DISABLE=y
 CONFIG_START_DAY=16
 CONFIG_START_MONTH=8
diff --git a/boards/sim/sim/sim/configs/nimble/defconfig b/boards/sim/sim/sim/configs/nimble/defconfig
index 0fee0b8..19d8223 100644
--- a/boards/sim/sim/sim/configs/nimble/defconfig
+++ b/boards/sim/sim/sim/configs/nimble/defconfig
@@ -47,7 +47,6 @@ CONFIG_NETDEV_WIRELESS_IOCTL=y
 CONFIG_NETINIT_NETLOCAL=y
 CONFIG_NET_BLUETOOTH=y
 CONFIG_NET_STATISTICS=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NIMBLE=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
diff --git a/boards/sim/sim/sim/configs/nsh/defconfig b/boards/sim/sim/sim/configs/nsh/defconfig
index 1b04899..24d2c78 100644
--- a/boards/sim/sim/sim/configs/nsh/defconfig
+++ b/boards/sim/sim/sim/configs/nsh/defconfig
@@ -32,7 +32,6 @@ CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/sim/sim/sim/configs/nsh2/defconfig b/boards/sim/sim/sim/configs/nsh2/defconfig
index 4cfa2e9..ab84ab4 100644
--- a/boards/sim/sim/sim/configs/nsh2/defconfig
+++ b/boards/sim/sim/sim/configs/nsh2/defconfig
@@ -34,7 +34,6 @@ CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_INPUT=y
 CONFIG_MAX_TASKS=64
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FATDEVNO=2
diff --git a/boards/sim/sim/sim/configs/nshcromfs/defconfig b/boards/sim/sim/sim/configs/nshcromfs/defconfig
index 892acb7..d373d9c 100644
--- a/boards/sim/sim/sim/configs/nshcromfs/defconfig
+++ b/boards/sim/sim/sim/configs/nshcromfs/defconfig
@@ -33,7 +33,6 @@ CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILE_APPS=y
diff --git a/boards/sim/sim/sim/configs/nxffs/defconfig b/boards/sim/sim/sim/configs/nxffs/defconfig
index 7d85737..25febf3 100644
--- a/boards/sim/sim/sim/configs/nxffs/defconfig
+++ b/boards/sim/sim/sim/configs/nxffs/defconfig
@@ -20,7 +20,6 @@ CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_LIB_RAND_ORDER=3
 CONFIG_MAX_TASKS=64
 CONFIG_MTD=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NXFFS_SCAN_VOLUME=y
 CONFIG_RAMMTD=y
 CONFIG_RAMMTD_FLASHSIM=y
diff --git a/boards/sim/sim/sim/configs/ostest/defconfig b/boards/sim/sim/sim/configs/ostest/defconfig
index 18b0ebf..3a67b24 100644
--- a/boards/sim/sim/sim/configs/ostest/defconfig
+++ b/boards/sim/sim/sim/configs/ostest/defconfig
@@ -18,7 +18,6 @@ CONFIG_FS_NAMED_SEMAPHORES=y
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_PTHREAD_CLEANUP=y
 CONFIG_PTHREAD_CLEANUP_STACKSIZE=3
 CONFIG_PTHREAD_MUTEX_TYPES=y
diff --git a/boards/sim/sim/sim/configs/pf_ieee802154/defconfig b/boards/sim/sim/sim/configs/pf_ieee802154/defconfig
index 86bcb61..fc362a0 100644
--- a/boards/sim/sim/sim/configs/pf_ieee802154/defconfig
+++ b/boards/sim/sim/sim/configs/pf_ieee802154/defconfig
@@ -50,7 +50,6 @@ CONFIG_NETINIT_NOMAC=y
 CONFIG_NET_IEEE802154=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_STATISTICS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/sim/sim/sim/configs/pktradio/defconfig b/boards/sim/sim/sim/configs/pktradio/defconfig
index 971bad7..60a872f 100644
--- a/boards/sim/sim/sim/configs/pktradio/defconfig
+++ b/boards/sim/sim/sim/configs/pktradio/defconfig
@@ -75,7 +75,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/sim/sim/sim/configs/rc/defconfig b/boards/sim/sim/sim/configs/rc/defconfig
index b889b72..af2dfed 100644
--- a/boards/sim/sim/sim/configs/rc/defconfig
+++ b/boards/sim/sim/sim/configs/rc/defconfig
@@ -29,7 +29,6 @@ CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILE_APPS=y
diff --git a/boards/sim/sim/sim/configs/sensor/defconfig b/boards/sim/sim/sim/configs/sensor/defconfig
index 23de03c..5b20b3c 100644
--- a/boards/sim/sim/sim/configs/sensor/defconfig
+++ b/boards/sim/sim/sim/configs/sensor/defconfig
@@ -30,7 +30,6 @@ CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILE_APPS=y
diff --git a/boards/sim/sim/sim/configs/sixlowpan/defconfig b/boards/sim/sim/sim/configs/sixlowpan/defconfig
index b3c7b6f..5cdaab2 100644
--- a/boards/sim/sim/sim/configs/sixlowpan/defconfig
+++ b/boards/sim/sim/sim/configs/sixlowpan/defconfig
@@ -76,7 +76,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/sim/sim/sim/configs/sotest/defconfig b/boards/sim/sim/sim/configs/sotest/defconfig
index 785a0ab..b048653 100644
--- a/boards/sim/sim/sim/configs/sotest/defconfig
+++ b/boards/sim/sim/sim/configs/sotest/defconfig
@@ -56,7 +56,6 @@ CONFIG_NET_TCP_NOTIFIER=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_NOTIFIER=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_LINELEN=200
diff --git a/boards/sim/sim/sim/configs/sotest32/defconfig b/boards/sim/sim/sim/configs/sotest32/defconfig
index 5d0f229..9cbcccc 100644
--- a/boards/sim/sim/sim/configs/sotest32/defconfig
+++ b/boards/sim/sim/sim/configs/sotest32/defconfig
@@ -56,7 +56,6 @@ CONFIG_NET_TCP_NOTIFIER=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_NOTIFIER=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_LINELEN=200
diff --git a/boards/sim/sim/sim/configs/spiffs/defconfig b/boards/sim/sim/sim/configs/spiffs/defconfig
index 5dc6216..4820a72 100644
--- a/boards/sim/sim/sim/configs/spiffs/defconfig
+++ b/boards/sim/sim/sim/configs/spiffs/defconfig
@@ -22,7 +22,6 @@ CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_LIB_RAND_ORDER=3
 CONFIG_MAX_TASKS=64
 CONFIG_MTD=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_RAMMTD=y
 CONFIG_RAMMTD_FLASHSIM=y
 CONFIG_SDCLONE_DISABLE=y
diff --git a/boards/sim/sim/sim/configs/tcpblaster/defconfig b/boards/sim/sim/sim/configs/tcpblaster/defconfig
index d8ca875..f82b754 100644
--- a/boards/sim/sim/sim/configs/tcpblaster/defconfig
+++ b/boards/sim/sim/sim/configs/tcpblaster/defconfig
@@ -80,7 +80,6 @@ CONFIG_NET_TUN_PKTSIZE=1500
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_BINDTODEVICE=y
 CONFIG_NET_UDP_WRITE_BUFFERS=y
-CONFIG_NFILE_DESCRIPTORS=18
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILE_APPS=y
diff --git a/boards/sim/sim/sim/configs/tcploop/defconfig b/boards/sim/sim/sim/configs/tcploop/defconfig
index a0a8318..b57a714 100644
--- a/boards/sim/sim/sim/configs/tcploop/defconfig
+++ b/boards/sim/sim/sim/configs/tcploop/defconfig
@@ -47,7 +47,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_TUN=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/sim/sim/sim/configs/udgram/defconfig b/boards/sim/sim/sim/configs/udgram/defconfig
index a7946a6..400a8fb 100644
--- a/boards/sim/sim/sim/configs/udgram/defconfig
+++ b/boards/sim/sim/sim/configs/udgram/defconfig
@@ -34,7 +34,6 @@ CONFIG_MAX_TASKS=64
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_LOCAL=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FATDEVNO=2
diff --git a/boards/sim/sim/sim/configs/unionfs/defconfig b/boards/sim/sim/sim/configs/unionfs/defconfig
index f816ccd..6bf932b 100644
--- a/boards/sim/sim/sim/configs/unionfs/defconfig
+++ b/boards/sim/sim/sim/configs/unionfs/defconfig
@@ -28,7 +28,6 @@ CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIB_ENVPATH=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FATDEVNO=2
diff --git a/boards/sim/sim/sim/configs/userfs/defconfig b/boards/sim/sim/sim/configs/userfs/defconfig
index b73a760..a0b5bd8 100644
--- a/boards/sim/sim/sim/configs/userfs/defconfig
+++ b/boards/sim/sim/sim/configs/userfs/defconfig
@@ -38,7 +38,6 @@ CONFIG_NETDEVICES=y
 CONFIG_NET_LOCAL=y
 CONFIG_NET_LOOPBACK=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/sim/sim/sim/configs/ustream/defconfig b/boards/sim/sim/sim/configs/ustream/defconfig
index 081db7d..ba88267 100644
--- a/boards/sim/sim/sim/configs/ustream/defconfig
+++ b/boards/sim/sim/sim/configs/ustream/defconfig
@@ -34,7 +34,6 @@ CONFIG_MAX_TASKS=64
 CONFIG_NET=y
 CONFIG_NETDEVICES=y
 CONFIG_NET_LOCAL=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FATDEVNO=2
diff --git a/boards/sim/sim/sim/configs/vpnkit/defconfig b/boards/sim/sim/sim/configs/vpnkit/defconfig
index 8a2f433..b9f76fd 100644
--- a/boards/sim/sim/sim/configs/vpnkit/defconfig
+++ b/boards/sim/sim/sim/configs/vpnkit/defconfig
@@ -68,7 +68,6 @@ CONFIG_NET_TCP_NOTIFIER=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_NOTIFIER=y
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
diff --git a/boards/x86/qemu/qemu-i486/configs/nsh/defconfig b/boards/x86/qemu/qemu-i486/configs/nsh/defconfig
index 8717588..9d31385 100644
--- a/boards/x86/qemu/qemu-i486/configs/nsh/defconfig
+++ b/boards/x86/qemu/qemu-i486/configs/nsh/defconfig
@@ -33,7 +33,6 @@ CONFIG_FS_PROCFS=y
 CONFIG_FS_ROMFS=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
diff --git a/boards/x86/qemu/qemu-i486/configs/ostest/defconfig b/boards/x86/qemu/qemu-i486/configs/ostest/defconfig
index 126b7d5..2316143 100644
--- a/boards/x86/qemu/qemu-i486/configs/ostest/defconfig
+++ b/boards/x86/qemu/qemu-i486/configs/ostest/defconfig
@@ -19,7 +19,6 @@ CONFIG_CONSOLE_SYSLOG=y
 CONFIG_FS_FAT=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_PTHREAD_MUTEX_TYPES=y
 CONFIG_RAM_SIZE=1048576
 CONFIG_RAM_START=0x00100000
diff --git a/boards/x86_64/intel64/qemu-intel64/configs/nsh/defconfig b/boards/x86_64/intel64/qemu-intel64/configs/nsh/defconfig
index b6e9564..30a7572 100644
--- a/boards/x86_64/intel64/qemu-intel64/configs/nsh/defconfig
+++ b/boards/x86_64/intel64/qemu-intel64/configs/nsh/defconfig
@@ -32,7 +32,6 @@ CONFIG_FS_PROCFS=y
 CONFIG_IDLETHREAD_STACKSIZE=4194304
 CONFIG_LIBM=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFCONFIG=y
diff --git a/boards/x86_64/intel64/qemu-intel64/configs/ostest/defconfig b/boards/x86_64/intel64/qemu-intel64/configs/ostest/defconfig
index 2c11994..2c56c97 100644
--- a/boards/x86_64/intel64/qemu-intel64/configs/ostest/defconfig
+++ b/boards/x86_64/intel64/qemu-intel64/configs/ostest/defconfig
@@ -28,7 +28,6 @@ CONFIG_CONSOLE_SYSLOG=y
 CONFIG_IDLETHREAD_STACKSIZE=4194304
 CONFIG_LIBM=y
 CONFIG_MAX_TASKS=64
-CONFIG_NFILE_DESCRIPTORS=32
 CONFIG_PREALLOC_CHILDSTATUS=16
 CONFIG_PRIORITY_INHERITANCE=y
 CONFIG_PTHREAD_MUTEX_TYPES=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/aes/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/aes/defconfig
index 94c23e3..a1fed19 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/aes/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/aes/defconfig
@@ -36,7 +36,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig
index aa2cd6a..1162b6d 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/leds/defconfig
@@ -28,7 +28,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mcp2515/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mcp2515/defconfig
index 3b361e4..9894a0d 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/mcp2515/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/mcp2515/defconfig
@@ -34,7 +34,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig
index 81c1f7d..e703f40 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/mmcsdspi/defconfig
@@ -38,7 +38,6 @@ CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_SPICLOCK=4000000
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig
index 0127f88..3d28266 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/netnsh/defconfig
@@ -47,7 +47,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig
index 4a8fded..b29accc 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig
index 08b1152..57da9de 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/ostest/defconfig
@@ -25,7 +25,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_LIB_BOARDCTL=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=114688
 CONFIG_RAM_START=0x20000000
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig
index e0ffb7d..c1fe3cb 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/pm/defconfig
@@ -27,7 +27,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig
index 25fcd0d..9ac4442 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/psram/defconfig
@@ -51,7 +51,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig
index 55a0a88..b1d01e1 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/random/defconfig
@@ -29,7 +29,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig
index 739f6c6..ce0c840 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/smp/defconfig
@@ -29,7 +29,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=4
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
index 3c699fb..076140e 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/spiflash/defconfig
@@ -30,7 +30,6 @@ CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
 CONFIG_MTD_SMART=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_LOSMART=y
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig
index f7fc520..7e51c9b 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/sta_softap/defconfig
@@ -55,7 +55,6 @@ CONFIG_NET_ICMP=y
 CONFIG_NET_ICMP_SOCKET=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig
index b75f3a7..2d17e03 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/timer/defconfig
@@ -32,7 +32,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
index 7d5e187..d6c4b9b 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi/defconfig
@@ -45,7 +45,6 @@ CONFIG_NET_ICMP_SOCKET=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
index e37dcd7..9d17a47 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/wapi_smp/defconfig
@@ -57,7 +57,6 @@ CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig
index f1f4da2..82ad117 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/watchdog/defconfig
@@ -31,7 +31,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig
index e86eea6..dbe6185 100644
--- a/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig
+++ b/boards/xtensa/esp32/esp32-devkitc/configs/watcher/defconfig
@@ -31,7 +31,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig
index e7c54da..9170ab8 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/ethernet/defconfig
@@ -46,7 +46,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig
index f64ce17..db32a5c 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/nsh/defconfig
@@ -26,7 +26,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
index c176b79..ea72d4e 100644
--- a/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-ethernet-kit/configs/wapi/defconfig
@@ -44,7 +44,6 @@ CONFIG_NET_ICMP_SOCKET=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/bmp180/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/bmp180/defconfig
index 8e7b739..27ac789 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/bmp180/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/bmp180/defconfig
@@ -29,7 +29,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig
index b3bedb9..864183b 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/gpio/defconfig
@@ -30,7 +30,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig
index a5f50c0..6b88b9d 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/leds/defconfig
@@ -28,7 +28,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig
index d569098..98c72c4 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/nsh/defconfig
@@ -27,7 +27,6 @@ CONFIG_IDLETHREAD_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=16
 CONFIG_MM_REGIONS=3
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
index 6eec702..aa7cc5c 100644
--- a/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
+++ b/boards/xtensa/esp32/esp32-wrover-kit/configs/wapi/defconfig
@@ -45,7 +45,6 @@ CONFIG_NET_ICMP_SOCKET=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig b/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig
index 2fad622..20e9946 100644
--- a/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig
+++ b/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig
@@ -21,7 +21,6 @@ CONFIG_BOARD_LOOPSPERMSEC=1250
 CONFIG_BUILTIN=y
 CONFIG_ENDIAN_BIG=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
diff --git a/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig b/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig
index 83dd971..0a9aab8 100644
--- a/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig
+++ b/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig
@@ -18,7 +18,6 @@ CONFIG_ENDIAN_BIG=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_IDLETHREAD_STACKSIZE=4096
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_RAM_SIZE=65536
diff --git a/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig b/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig
index 4d59005..edf2238 100644
--- a/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig
+++ b/boards/z80/ez80/ez80f910200kitg/configs/ostest/defconfig
@@ -24,7 +24,6 @@ CONFIG_EZ80_UART0=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_MAX_TASKS=8
 CONFIG_MMCSD=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=1024
diff --git a/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig
index 939c496..ed74ce3 100644
--- a/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig
+++ b/boards/z80/ez80/ez80f910200zco/configs/dhcpd/defconfig
@@ -36,7 +36,6 @@ CONFIG_NET_ICMP=y
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUNGET_CHARS=0
 CONFIG_PTHREAD_STACK_DEFAULT=1024
 CONFIG_RAM_SIZE=65536
diff --git a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig
index 992316e..54f51e8 100644
--- a/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig
+++ b/boards/z80/ez80/ez80f910200zco/configs/httpd/defconfig
@@ -35,7 +35,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_CONNS=16
-CONFIG_NFILE_DESCRIPTORS=24
 CONFIG_NUNGET_CHARS=0
 CONFIG_RAM_SIZE=65536
 CONFIG_RR_INTERVAL=200
diff --git a/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig b/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig
index a84f599..04e8530 100644
--- a/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig
+++ b/boards/z80/ez80/ez80f910200zco/configs/nettest/defconfig
@@ -33,7 +33,6 @@ CONFIG_NET_ICMP=y
 CONFIG_NET_MAX_LISTENPORTS=8
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUNGET_CHARS=0
 CONFIG_PTHREAD_STACK_DEFAULT=1024
 CONFIG_RAM_SIZE=65536
diff --git a/boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig b/boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig
index b52c4d1..84c69be 100644
--- a/boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig
+++ b/boards/z80/ez80/ez80f910200zco/configs/nsh/defconfig
@@ -39,7 +39,6 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
diff --git a/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig
index 5747100..248780e 100644
--- a/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig
+++ b/boards/z80/ez80/ez80f910200zco/configs/poll/defconfig
@@ -33,7 +33,6 @@ CONFIG_NET_MAX_LISTENPORTS=8
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_TCP=y
 CONFIG_NET_TCPBACKLOG=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NUNGET_CHARS=0
 CONFIG_PIPES=y
 CONFIG_PTHREAD_STACK_DEFAULT=1024
diff --git a/boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig b/boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig
index 60cc6b7..08258da 100644
--- a/boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig
+++ b/boards/z80/ez80/makerlisp/configs/nsh_flash/defconfig
@@ -30,7 +30,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig b/boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig
index 04b16e9..32cc23b 100644
--- a/boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig
+++ b/boards/z80/ez80/makerlisp/configs/nsh_ram/defconfig
@@ -31,7 +31,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/z80/ez80/makerlisp/configs/sdboot/defconfig b/boards/z80/ez80/makerlisp/configs/sdboot/defconfig
index 5b03cd8..c343c8b 100644
--- a/boards/z80/ez80/makerlisp/configs/sdboot/defconfig
+++ b/boards/z80/ez80/makerlisp/configs/sdboot/defconfig
@@ -30,7 +30,7 @@ CONFIG_MAKERLISP_SDBOOT=y
 CONFIG_MAX_TASKS=8
 CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_DEFAULT=1024
 CONFIG_RAM_SIZE=65536
diff --git a/boards/z80/ez80/z20x/configs/hello/defconfig b/boards/z80/ez80/z20x/configs/hello/defconfig
index cc439ea..e15986b 100644
--- a/boards/z80/ez80/z20x/configs/hello/defconfig
+++ b/boards/z80/ez80/z20x/configs/hello/defconfig
@@ -22,7 +22,6 @@ CONFIG_EXAMPLES_HELLO=y
 CONFIG_EZ80_UART1=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_MAX_TASKS=16
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_DEFAULT=1024
 CONFIG_RAM_SIZE=65536
diff --git a/boards/z80/ez80/z20x/configs/nsh/defconfig b/boards/z80/ez80/z20x/configs/nsh/defconfig
index ff8f1a6..1e32d93 100644
--- a/boards/z80/ez80/z20x/configs/nsh/defconfig
+++ b/boards/z80/ez80/z20x/configs/nsh/defconfig
@@ -31,7 +31,6 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_MAX_TASKS=16
 CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
-CONFIG_NFILE_DESCRIPTORS=8
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_FILEIOSIZE=512
diff --git a/boards/z80/ez80/z20x/configs/sdboot/defconfig b/boards/z80/ez80/z20x/configs/sdboot/defconfig
index 5d5e4ae..94a543c 100644
--- a/boards/z80/ez80/z20x/configs/sdboot/defconfig
+++ b/boards/z80/ez80/z20x/configs/sdboot/defconfig
@@ -28,7 +28,7 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_MAX_TASKS=8
 CONFIG_MMCSD=y
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_DEFAULT=1024
 CONFIG_RAM_SIZE=65536
diff --git a/boards/z80/ez80/z20x/configs/w25boot/defconfig b/boards/z80/ez80/z20x/configs/w25boot/defconfig
index 7cd6472..ef77523 100644
--- a/boards/z80/ez80/z20x/configs/w25boot/defconfig
+++ b/boards/z80/ez80/z20x/configs/w25boot/defconfig
@@ -23,7 +23,7 @@ CONFIG_HOST_WINDOWS=y
 CONFIG_MAX_TASKS=8
 CONFIG_MTD=y
 CONFIG_MTD_W25=y
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_DEFAULT=1024
 CONFIG_RAM_SIZE=65536
diff --git a/boards/z80/z180/p112/configs/ostest/defconfig b/boards/z80/z180/p112/configs/ostest/defconfig
index d902641..1b8faad 100644
--- a/boards/z80/z180/p112/configs/ostest/defconfig
+++ b/boards/z80/z180/p112/configs/ostest/defconfig
@@ -23,7 +23,7 @@ CONFIG_DISABLE_PTHREAD=y
 CONFIG_GRAN=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=3
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=3
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=1024
diff --git a/boards/z80/z8/z8encore000zco/configs/ostest/defconfig b/boards/z80/z8/z8encore000zco/configs/ostest/defconfig
index 029141d..4aac420 100644
--- a/boards/z80/z8/z8encore000zco/configs/ostest/defconfig
+++ b/boards/z80/z8/z8encore000zco/configs/ostest/defconfig
@@ -24,7 +24,7 @@ CONFIG_DISABLE_PTHREAD=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_IDLETHREAD_STACKSIZE=256
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=3
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=3
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=256
diff --git a/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig b/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig
index fdf117e..638a171 100644
--- a/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig
+++ b/boards/z80/z8/z8f64200100kit/configs/ostest/defconfig
@@ -23,7 +23,7 @@ CONFIG_DISABLE_PTHREAD=y
 CONFIG_HOST_WINDOWS=y
 CONFIG_IDLETHREAD_STACKSIZE=256
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=3
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=3
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=256
diff --git a/boards/z80/z80/z80sim/configs/nsh/defconfig b/boards/z80/z80/z80sim/configs/nsh/defconfig
index dd78d4f..f17dcf7 100644
--- a/boards/z80/z80/z80sim/configs/nsh/defconfig
+++ b/boards/z80/z80/z80sim/configs/nsh/defconfig
@@ -31,7 +31,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_LINELEN=40
 CONFIG_NUNGET_CHARS=0
diff --git a/boards/z80/z80/z80sim/configs/ostest/defconfig b/boards/z80/z80/z80sim/configs/ostest/defconfig
index a25dff5..f39174e 100644
--- a/boards/z80/z80/z80sim/configs/ostest/defconfig
+++ b/boards/z80/z80/z80sim/configs/ostest/defconfig
@@ -19,7 +19,7 @@ CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_MAX_TASKS=8
-CONFIG_NFILE_DESCRIPTORS=3
+CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=3
 CONFIG_NUNGET_CHARS=0
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PTHREAD_STACK_DEFAULT=1024
diff --git a/drivers/usbhost/Kconfig b/drivers/usbhost/Kconfig
index 4ffbd36..51934b0 100644
--- a/drivers/usbhost/Kconfig
+++ b/drivers/usbhost/Kconfig
@@ -107,7 +107,7 @@ config USBHOST_MSC
 	depends on !BULK_DISABLE
 	---help---
 		Enable support for the mass storage class driver.  This also depends on
-		NFILE_DESCRIPTORS > 0 && SCHED_WORKQUEUE=y
+		SCHED_WORKQUEUE=y
 
 config USBHOST_MSC_NOTIFIER
 	bool "Support USB Mass Storage notifications"
diff --git a/libs/libc/zoneinfo/README.txt b/libs/libc/zoneinfo/README.txt
index 5c7b3bf..a81bb1e 100644
--- a/libs/libc/zoneinfo/README.txt
+++ b/libs/libc/zoneinfo/README.txt
@@ -127,10 +127,6 @@ Sample Code to Mount the ROMFS Filesystem
 #  error "Mountpoint support is disabled"
 #endif
 
-#if CONFIG_NFILE_DESCRIPTORS < 4
-#  error "Not enough file descriptors"
-#endif
-
 #ifndef CONFIG_FS_ROMFS
 #  error "ROMFS support not enabled"
 #endif
diff --git a/tools/mkromfsimg.sh b/tools/mkromfsimg.sh
index f7b1b14..2092488 100755
--- a/tools/mkromfsimg.sh
+++ b/tools/mkromfsimg.sh
@@ -64,7 +64,6 @@ fi
 romfsetc=`grep CONFIG_NSH_ROMFSETC= $topdir/.config | cut -d'=' -f2`
 disablempt=`grep CONFIG_DISABLE_MOUNTPOINT= $topdir/.config | cut -d'=' -f2`
 disablescript=`grep CONFIG_NSH_DISABLESCRIPT= $topdir/.config | cut -d'=' -f2`
-ndescriptors=`grep CONFIG_NFILE_DESCRIPTORS= $topdir/.config | cut -d'=' -f2`
 devconsole=`grep CONFIG_DEV_CONSOLE= $topdir/.config | cut -d'=' -f2`
 romfs=`grep CONFIG_FS_ROMFS= $topdir/.config | cut -d'=' -f2`
 romfsmpt=`grep CONFIG_NSH_ROMFSMOUNTPT= $topdir/.config | cut -d'=' -f2`
@@ -100,15 +99,6 @@ if [ "X$disablescript" = "Xy" ]; then
   exit 1
 fi
 
-# We need at least 5 file descriptors:  One for the ROMFS mount and one for
-# FAT mount performed in rcS, plus three for stdio.
-
-if [ -z "$ndescriptors" -o "$ndescriptors" -lt 5 ]; then
-  echo "Insufficient file descriptors have been allocated"
-  echo "Set CONFIG_NFILE_DESCRIPTORS to value greater than 4"
-  exit 1
-fi
-
 # ROMFS support is required, of course
 
 if [ "X$romfs" != "Xy" ]; then