sched: move etc romfs mount from nsh to sched/init

Usually the startup script is placed under /etc. The contents of the etc directory
are compiled and linked with Nuttx binary in the form of romfs. After startup,
it will be  mounted by Nsh.

etc is generated by the different boards, that use genromfs and xxd tools to generate
and compile it into the Nuttx, for example: boards/arm/at32/at32f437-mini/tool/mkromfs.sh
The more common method is etc image generated from the content in the corresponding
board/arch/board/board/src/etc directory, and added by Makefile for example:
boards/sim/sim/sim/src/etc.

But in kernel/protected mode, Nuttx kernel and apps are run in different privileged/
non-privileged mode or the isolated binarys, so as that nsh should use syscall to
access Nuttx kernel by exported API. In this scenario, nsh can not mount the etc image
content, because that is generated in board and as a part of Nuttx kernel.

changes:

- move etc romfs mount from nsh to Nuttx, but keep the script to parse and execute.
- move and rename the related CONFIG, move customized nsh_romfsimg.h to etc_romfs.c
  in boards, and no need declaration for romfs_img/romfs_img_len.

This commit changes and updates all configurations in Nuttx arch/board as much as possible,
but if any missing, please refer to the following simple guide:

- rename CONFIG_NSH_ROMFSETC to CONFIG_ETC_ROMFS, and delete CONFIG_NSH_ARCHROMFS in defconfig
- rename the etc romfs mount configs, for example CONFIG_NSH_FATDEVNO to CONFIG_ETC_FATDEVNO
- move customized nsh_romfsimg.h to etc_romfs.c in board/arch/board/board/src and no need
  declaration for romfs_img/romfs_img_len.
- delete default nsh_romfsimg.h, if ROMFSETC is enabled, should generate and compile etc_romfs.c
  in board/arch/board/board/src.

Signed-off-by: fangxinyong <fangxinyong@xiaomi.com>

arch/arm64/src/common/arm64_arch.h

@@ -32,6 +32,7 @@
  */
 #ifndef __ASSEMBLY__
   #include <stdint.h>
+  #include <nuttx/nuttx.h>
 #endif
 
 #include <sys/param.h>
@@ -143,8 +144,6 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define STRINGIFY(x)    #x
-
 #define GET_EL(mode)  (((mode) >> MODE_EL_SHIFT) & MODE_EL_MASK)
 
 /* MPIDR_EL1, Multiprocessor Affinity Register */

boards/Board.mk

@@ -35,7 +35,7 @@ $(ETCSRC): $(addprefix $(BOARD_DIR)$(DELIM)src$(DELIM),$(RCRAWS)) $(RCOBJS)
 	  $(shell rm -rf $(ETCDIR)$(DELIM)$(raw)) \
 	  $(shell mkdir -p $(dir $(ETCDIR)$(DELIM)$(raw))) \
 	  $(shell cp -rfp $(BOARD_DIR)$(DELIM)src$(DELIM)$(raw) $(ETCDIR)$(DELIM)$(raw)))
-	$(Q) genromfs -f romfs.img -d $(ETCDIR)$(DELIM)$(CONFIG_NSH_ROMFSMOUNTPT) -V "NSHInitVol"
+	$(Q) genromfs -f romfs.img -d $(ETCDIR)$(DELIM)$(CONFIG_ETC_ROMFSMOUNTPT) -V "NSHInitVol"
 	$(Q) echo "#include <nuttx/compiler.h>" > $@
 	$(Q) xxd -i romfs.img | sed -e "s/^unsigned char/const unsigned char aligned_data(4)/g" >> $@
 	$(Q) rm romfs.img

boards/arm/at32/at32f437-mini/src/Makefile

@@ -80,4 +80,8 @@ ifeq ($(CONFIG_MTD_AT24XX),y)
 	CSRCS += at32_at24.c
 endif
 
-include $(TOPDIR)/boards/Board.mk
+ifeq ($(CONFIG_ETC_ROMFS),y)
+	CSRCS += etc_romfs.c
+endif
+
+include $(TOPDIR)/boards/Board.mk

boards/arm/at32/at32f437-mini/src/etc_romfs.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/at32/at32f437-mini/include/nsh_romfsimg.h
+ * boards/arm/at32/at32f437-mini/src/etc_romfs.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,6 +18,10 @@
  *
  ****************************************************************************/
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 unsigned char romfs_img[] =
 {
   0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x03, 0x70,
@@ -109,3 +113,7 @@ unsigned char romfs_img[] =
 };
 
 unsigned int romfs_img_len = 1024;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/

boards/arm/at32/at32f437-mini/tool/mkromfs.sh

@@ -3,9 +3,9 @@
 
 genromfs -f romfs.img -d ../romfs -v -V "romfs"
 
-xxd -i romfs.img nsh_romfsimg.h
+xxd -i romfs.img etc_romfs.c
 
-cp nsh_romfsimg.h ../include
+cp etc_romfs.c ../src
 
-rm romfs.img nsh_romfsimg.h
+rm romfs.img etc_romfs.c
 

boards/arm/dm320/ntosd-dm320/configs/nsh/defconfig

@@ -40,7 +40,6 @@ CONFIG_NET_TCP=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PTHREAD_STACK_DEFAULT=4096
 CONFIG_RAM_SIZE=33554432
 CONFIG_RAM_START=0x01100000

boards/arm/fvp-v8r-aarch32/fvp-armv8r-aarch32/configs/nsh/defconfig

@@ -35,7 +35,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192
 CONFIG_RAMLOG=y

boards/arm/gd32f4/gd32f470zk-eval/src/Makefile

@@ -65,4 +65,8 @@ ifeq ($(CONFIG_BOARDCTL_RESET), y)
 CSRCS += gd32f4xx_reset.c
 endif
 
+ifeq ($(CONFIG_ETC_ROMFS), y)
+CSRCS += etc_romfs.c
+endif
+
 include $(TOPDIR)/boards/Board.mk

boards/arm/gd32f4/gd32f470zk-eval/src/etc_romfs.c

@@ -1,5 +1,5 @@
 /***************************************************************************
- * boards/arm/gd32f4/gd32f470zk-eval/include/nsh_romfsimg.h
+ * boards/arm/gd32f4/gd32f470zk-eval/src/etc_romfs.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,6 +18,10 @@
  *
  ***************************************************************************/
 
+/***************************************************************************
+ * Public Data
+ ***************************************************************************/
+
 const unsigned char romfs_img[] =
 {
   0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x01, 0x50,
@@ -109,3 +113,7 @@ const unsigned char romfs_img[] =
 };
 
 const unsigned int romfs_img_len = 1024;
+
+/***************************************************************************
+ * Public Functions
+ ***************************************************************************/

boards/arm/imxrt/teensy-4.x/configs/pikron-bb/defconfig

@@ -123,7 +123,6 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_NXFONTS_DISABLE_16BPP=y
 CONFIG_NXFONTS_DISABLE_1BPP=y
 CONFIG_NXFONTS_DISABLE_24BPP=y

boards/arm/lpc17xx_40xx/lx_cpu/configs/nsh/defconfig

@@ -21,6 +21,7 @@ CONFIG_ARCH_RAMVECTORS=y
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_BOARDCTL_APP_SYMTAB=y
 CONFIG_BOARDCTL_RESET=y
+CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LOOPSPERMSEC=11934
 CONFIG_BOOT_RUNFROMSDRAM=y
 CONFIG_BUILTIN=y
@@ -125,7 +126,6 @@ CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_NXFLAT=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PRIORITY_INHERITANCE=y

boards/arm/phy62xx/phy6222/src/Makefile

@@ -29,4 +29,8 @@ CSRCS += appinit.c
 
 CSRCS += reset.c
 
+ifeq ($(CONFIG_ETC_ROMFS),y)
+CSRCS += etc_romfs.c
+endif
+
 include $(TOPDIR)/boards/Board.mk

boards/arm/phy62xx/phy6222/src/etc_romfs.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/phy62xx/phy6222/include/nsh_romfsimg.h
+ * boards/arm/phy62xx/phy6222/src/etc_romfs.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,6 +18,10 @@
  *
  ****************************************************************************/
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 unsigned char romfs_img[] =
 {
   0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x00, 0xf0,
@@ -108,3 +112,7 @@ unsigned char romfs_img[] =
   0x00, 0x00, 0x00, 0x00
 };
 unsigned int romfs_img_len = 1024;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/

boards/arm/qemu/qemu-armv7a/configs/nsh/defconfig

@@ -41,7 +41,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_ONESHOT=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAMLOG=y

boards/arm/s32k1xx/rddrone-bms772/src/Makefile

@@ -67,4 +67,8 @@ ifeq ($(CONFIG_SMBUS_SBD),y)
 CSRCS += s32k1xx_smbus_sbd.c
 endif
 
+ifeq ($(CONFIG_ETC_ROMFS),y)
+CSRCS += etc_romfs.c
+endif
+
 include $(TOPDIR)/boards/Board.mk

boards/arm/s32k1xx/rddrone-bms772/src/etc_romfs.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/s32k1xx/rddrone-bms772/include/nsh_romfsimg.h
+ * boards/arm/s32k1xx/rddrone-bms772/src/etc_romfs.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -20,9 +20,6 @@
 
 /* Copyright 2022 NXP */
 
-#ifndef __BOARDS_ARM_S32K1XX_RDDRONE_BMS772_INCLUDE_NSH_ROMFSIMG_H
-#define __BOARDS_ARM_S32K1XX_RDDRONE_BMS772_INCLUDE_NSH_ROMFSIMG_H
-
 /****************************************************************************
  * Included Files
  ****************************************************************************/
@@ -40,7 +37,7 @@
  * memory usage after board initialization has finished.
  */
 
-const unsigned char aligned_data(4) romfs_img[] =
+const unsigned char romfs_img[] =
 {
   0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x01, 0xb0,
   0x98, 0xcd, 0xf3, 0x32, 0x4e, 0x53, 0x48, 0x49, 0x6e, 0x69, 0x74, 0x56,
@@ -135,7 +132,7 @@ const unsigned int romfs_img_len = 1024;
 
 /* Init script does not call the free command to show available memory */
 
-const unsigned char aligned_data(4) romfs_img[] =
+const unsigned char romfs_img[] =
 {
   0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x01, 0xb0,
   0x4e, 0x7a, 0x78, 0x04, 0x4e, 0x53, 0x48, 0x49, 0x6e, 0x69, 0x74, 0x56,
@@ -227,4 +224,7 @@ const unsigned char aligned_data(4) romfs_img[] =
 const unsigned int romfs_img_len = 1024;
 
 #endif /* CONFIG_DEBUG_FEATURES */
-#endif /* __BOARDS_ARM_S32K1XX_RDDRONE_BMS772_INCLUDE_NSH_ROMFSIMG_H */
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/

boards/arm/sama5/jupiter-nano/configs/sdmmc-nsh-net-resolvconf/defconfig

@@ -31,6 +31,7 @@ CONFIG_DEBUG_FULLOPT=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_ROMFS=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_TCPBLASTER=y
 CONFIG_EXAMPLES_TCPECHO=y
@@ -74,13 +75,11 @@ CONFIG_NET_TCP_NOTIFIER=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_PROMPT_STRING="nsh>  "
 CONFIG_NSH_QUOTE=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=268435456
 CONFIG_RAM_START=0x20000000

boards/arm/sama5/jupiter-nano/src/Makefile

@@ -124,4 +124,8 @@ ifeq ($(CONFIG_BOARDCTL_RESET),y)
 CSRCS += sam_reset.c
 endif
 
+ifeq ($(CONFIG_ETC_ROMFS),y)
+CSRCS += etc_romfs.c
+endif
+
 include $(TOPDIR)/boards/Board.mk

boards/arm/sama5/jupiter-nano/src/etc_romfs.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/sama5/jupiter-nano/include/nsh_romfsimg.h
+ * boards/arm/sama5/jupiter-nano/src/etc_romfs.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,11 @@
  *
  ****************************************************************************/
 
-const unsigned char aligned_data(4) romfs_img[] =
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+const unsigned char romfs_img[] =
 {
   0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x01, 0x30,
   0x8b, 0x5f, 0xf8, 0x70, 0x4e, 0x53, 0x48, 0x49, 0x6e, 0x69, 0x74, 0x56,
@@ -108,3 +112,7 @@ const unsigned char aligned_data(4) romfs_img[] =
   0x00, 0x00, 0x00, 0x00
 };
 unsigned int romfs_img_len = 1024;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/

boards/arm/sama5/sama5d3-xplained/configs/ethernet-over-usb-2-high-speed/defconfig

@@ -67,7 +67,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_PROMPT_STRING="nsh>  "
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=268435456
 CONFIG_RAM_START=0x20000000

boards/arm/sama5/sama5d4-ek/configs/ipv6/defconfig

@@ -33,6 +33,7 @@ CONFIG_BOOT_RUNFROMSDRAM=y
 CONFIG_BUILTIN=y
 CONFIG_DEV_ZERO=y
 CONFIG_DRIVERS_AUDIO=y
+CONFIG_ETC_ROMFS=y
 CONFIG_ETH0_PHY_KSZ8081=y
 CONFIG_EXAMPLES_NX=y
 CONFIG_EXAMPLES_NX_BPP=16
@@ -75,11 +76,9 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_NX=y
 CONFIG_NXFONT_SERIF22X28B=y
 CONFIG_NXPLAYER_DEFAULT_MEDIADIR="/mnt/sdcard"

boards/arm/sama5/sama5d4-ek/configs/nsh/defconfig

@@ -32,6 +32,7 @@ CONFIG_BOOT_RUNFROMSDRAM=y
 CONFIG_BUILTIN=y
 CONFIG_DEV_ZERO=y
 CONFIG_DRIVERS_AUDIO=y
+CONFIG_ETC_ROMFS=y
 CONFIG_ETH0_PHY_KSZ8081=y
 CONFIG_EXAMPLES_NX=y
 CONFIG_EXAMPLES_NX_BPP=16
@@ -77,11 +78,9 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_NX=y
 CONFIG_NXFONT_SERIF22X28B=y
 CONFIG_NXPLAYER_DEFAULT_MEDIADIR="/mnt/sdcard"

boards/arm/sama5/sama5d4-ek/configs/nxwm/defconfig

@@ -36,6 +36,7 @@ CONFIG_BOOT_RUNFROMSDRAM=y
 CONFIG_BUILTIN=y
 CONFIG_DEV_ZERO=y
 CONFIG_DRIVERS_AUDIO=y
+CONFIG_ETC_ROMFS=y
 CONFIG_ETH0_PHY_KSZ8081=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
@@ -80,12 +81,10 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_NX=y
 CONFIG_NXFONT_SANS28X37=y
 CONFIG_NXFONT_SANS28X37B=y

boards/arm/sama5/sama5d4-ek/src/Makefile

@@ -126,4 +126,8 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
 CSRCS += sam_buttons.c
 endif
 
+ifeq ($(CONFIG_ETC_ROMFS),y)
+CSRCS += etc_romfs.c
+endif
+
 include $(TOPDIR)/boards/Board.mk

boards/arm/sama5/sama5d4-ek/src/etc_romfs.c

@@ -1,5 +1,5 @@
 /***************************************************************************
- * boards/arm/sama5/sama5d4-ek/include/nsh_romfsimg.h
+ * boards/arm/sama5/sama5d4-ek/src/etc_romfs.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,12 @@
  *
  ***************************************************************************/
 
-unsigned char romfs_img[] = {
+/***************************************************************************
+ * Public Data
+ ***************************************************************************/
+
+unsigned char romfs_img[] =
+{
   0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x02, 0x00,
   0xe7, 0x04, 0x63, 0xbd, 0x4e, 0x53, 0x48, 0x49, 0x6e, 0x69, 0x74, 0x56,
   0x6f, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,
@@ -107,3 +112,7 @@ unsigned char romfs_img[] = {
   0x00, 0x00, 0x00, 0x00
 };
 unsigned int romfs_img_len = 1024;
+
+/***************************************************************************
+ * Public Functions
+ ***************************************************************************/

boards/arm/samv7/same70-xplained/configs/pysim/defconfig

@@ -98,7 +98,6 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_POSIX_SPAWN_DEFAULT_STACKSIZE=2048
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PSEUDOTERM=y

boards/arm/stm32/mikroe-stm32f4/configs/fulldemo/defconfig

@@ -37,6 +37,8 @@ CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
 CONFIG_DRIVERS_AUDIO=y
+CONFIG_ETC_FATDEVNO=0
+CONFIG_ETC_ROMFS=y
 CONFIG_EXAMPLES_NX=y
 CONFIG_EXAMPLES_NX_BPP=16
 CONFIG_EXAMPLES_TOUCHSCREEN=y
@@ -67,13 +69,10 @@ CONFIG_MTD_CONFIG=y
 CONFIG_MTD_PARTITION=y
 CONFIG_MTD_SMART_SECTOR_SIZE=512
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=0
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_NSH_STRERROR=y
 CONFIG_NX=y
 CONFIG_NXFONT_SANS17X23B=y

boards/arm/stm32/mikroe-stm32f4/src/Make.defs

@@ -66,6 +66,10 @@ ifeq ($(CONFIG_AUDIO_VS1053),y)
 CSRCS += stm32_vs1053.c
 endif
 
+ifeq ($(CONFIG_ETC_ROMFS),y)
+CSRCS += etc_romfs.c
+endif
+
 DEPPATH += --dep-path board
 VPATH += :board
 CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board

boards/arm/stm32/mikroe-stm32f4/src/etc_romfs.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/stm32/mikroe-stm32f4/include/nsh_romfsimg.h
+ * boards/arm/stm32/mikroe-stm32f4/src/etc_romfs.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,6 +18,10 @@
  *
  ****************************************************************************/
 
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
 unsigned char romfs_img[] =
 {
   0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x01, 0x80,
@@ -108,3 +112,7 @@ unsigned char romfs_img[] =
   0x00, 0x00, 0x00, 0x00
 };
 unsigned int romfs_img_len = 1024;
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/

boards/arm/stm32l4/stm32l476vg-disco/configs/nsh/defconfig

@@ -25,6 +25,7 @@ CONFIG_BOARD_LOOPSPERMSEC=8499
 CONFIG_BUILTIN=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_ROMFS=y
 CONFIG_EXAMPLES_ALARM=y
 CONFIG_EXAMPLES_MEDIA=y
 CONFIG_FS_PROCFS=y
@@ -40,12 +41,10 @@ CONFIG_MTD_N25QXXX=y
 CONFIG_MTD_PARTITION=y
 CONFIG_N25QXXX_SECTOR512=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=98304
 CONFIG_RAM_START=0x20000000

boards/arm/stm32l4/stm32l476vg-disco/include/rc.sysinit.template

@@ -1,2 +1,2 @@
 # sample rc.sysinit file; you must run tools/genromfs <nuttx dir> from within this
-# location to convert this file to nsh_romfsimg.h for inclusion in the build
+# location to convert this file to etc_romfs.c for inclusion in the build

boards/arm/stm32l4/stm32l476vg-disco/include/rcS.template

@@ -1,2 +1,2 @@
 # sample rcS file; you must run tools/genromfs <nuttx dir> from within this
-# location to convert this file to nsh_romfsimg.h for inclusion in the build
+# location to convert this file to etc_romfs.c for inclusion in the build

boards/arm/stm32l4/stm32l476vg-disco/src/Makefile

@@ -48,4 +48,8 @@ ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
+ifeq ($(CONFIG_ETC_ROMFS),y)
+CSRCS += etc_romfs.c
+endif
+
 include $(TOPDIR)/boards/Board.mk

boards/arm/stm32l4/stm32l476vg-disco/src/etc_romfs.c

@@ -1,5 +1,5 @@
 /***************************************************************************
- * boards/arm/stm32l4/stm32l476vg-disco/include/nsh_romfsimg.h
+ * boards/arm/stm32l4/stm32l476vg-disco/src/etc_romfs.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,12 @@
  *
  ***************************************************************************/
 
-unsigned char romfs_img[] = {
+/***************************************************************************
+ * Public Data
+ ***************************************************************************/
+
+unsigned char romfs_img[] =
+{
   0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x01, 0x80,
   0x42, 0x56, 0x48, 0x93, 0x4e, 0x53, 0x48, 0x49, 0x6e, 0x69, 0x74, 0x56,
   0x6f, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,
@@ -107,3 +112,7 @@ unsigned char romfs_img[] = {
   0x00, 0x00, 0x00, 0x00
 };
 unsigned int romfs_img_len = 1024;
+
+/***************************************************************************
+ * Public Functions
+ ***************************************************************************/

boards/arm/stm32l4/stm32l4r9ai-disco/configs/nsh/defconfig

@@ -24,6 +24,7 @@ CONFIG_BOARD_LOOPSPERMSEC=9234
 CONFIG_BUILTIN=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_ROMFS=y
 CONFIG_EXAMPLES_ALARM=y
 CONFIG_EXAMPLES_MEDIA=y
 CONFIG_EXAMPLES_RANDOM=y
@@ -41,12 +42,10 @@ CONFIG_MM_REGIONS=3
 CONFIG_MTD=y
 CONFIG_MTD_PARTITION=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAM_SIZE=98304
 CONFIG_RAM_START=0x20000000

boards/arm/stm32l4/stm32l4r9ai-disco/include/rc.sysinit.template

@@ -1,2 +1,2 @@
 # sample rc.sysinit file; you must run tools/genromfs <nuttx dir> from within this
-# location to convert this file to nsh_romfsimg.h for inclusion in the build
+# location to convert this file to etc_romfs.c for inclusion in the build

boards/arm/stm32l4/stm32l4r9ai-disco/include/rcS.template

@@ -1,2 +1,2 @@
 # sample rcS file; you must run tools/genromfs <nuttx dir> from within this
-# location to convert this file to nsh_romfsimg.h for inclusion in the build
+# location to convert this file to etc_romfs.c for inclusion in the build

boards/arm/stm32l4/stm32l4r9ai-disco/src/Makefile

@@ -61,4 +61,8 @@ ifeq ($(CONFIG_BOARDCTL),y)
 CSRCS += stm32_appinit.c
 endif
 
+ifeq ($(CONFIG_ETC_ROMFS),y)
+CSRCS += etc_romfs.c
+endif
+
 include $(TOPDIR)/boards/Board.mk

boards/arm/stm32l4/stm32l4r9ai-disco/src/etc_romfs.c

@@ -1,5 +1,5 @@
 /***************************************************************************
- * boards/arm/stm32l4/stm32l4r9ai-disco/include/nsh_romfsimg.h
+ * boards/arm/stm32l4/stm32l4r9ai-disco/src/etc_romfs.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,12 @@
  *
  ***************************************************************************/
 
-unsigned char romfs_img[] = {
+/***************************************************************************
+ * Public Data
+ ***************************************************************************/
+
+unsigned char romfs_img[] =
+{
   0x2d, 0x72, 0x6f, 0x6d, 0x31, 0x66, 0x73, 0x2d, 0x00, 0x00, 0x01, 0x80,
   0x42, 0x56, 0x48, 0x93, 0x4e, 0x53, 0x48, 0x49, 0x6e, 0x69, 0x74, 0x56,
   0x6f, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x49,
@@ -107,3 +112,7 @@ unsigned char romfs_img[] = {
   0x00, 0x00, 0x00, 0x00
 };
 unsigned int romfs_img_len = 1024;
+
+/***************************************************************************
+ * Public Functions
+ ***************************************************************************/

boards/arm/tms570/tms570ls31x-usb-kit/include/nsh_romfsimg.h

@@ -1,41 +0,0 @@
-/****************************************************************************
- * boards/arm/tms570/tms570ls31x-usb-kit/include/nsh_romfsimg.h
- *   Copyright (C) 2013 PX4 Development Team. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name PX4 nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/* nsh_romfsetc.h
- *
- * This file is a stub for 'make export' purposes; the actual ROMFS
- * must be supplied by the library client.
- */
-
-extern unsigned char romfs_img[];
-extern unsigned int romfs_img_len;

boards/arm64/a64/pinephone/configs/lcd/defconfig

@@ -39,7 +39,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PINEPHONE_LCD=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192

boards/arm64/a64/pinephone/configs/lvgl/defconfig

@@ -57,7 +57,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PINEPHONE_LCD=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192

boards/arm64/a64/pinephone/configs/nsh/defconfig

@@ -39,7 +39,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192
 CONFIG_RAMLOG=y

boards/arm64/a64/pinephone/configs/sensor/defconfig

@@ -42,7 +42,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192
 CONFIG_RAMLOG=y

boards/arm64/fvp-v8r/fvp-armv8r/configs/citest/defconfig

@@ -36,7 +36,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192
 CONFIG_RAMLOG=y

boards/arm64/fvp-v8r/fvp-armv8r/configs/citest_smp/defconfig

@@ -36,7 +36,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192
 CONFIG_RAMLOG=y

boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh/defconfig

@@ -38,7 +38,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192
 CONFIG_RAMLOG=y

boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh_smp/defconfig

@@ -38,7 +38,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192
 CONFIG_RAMLOG=y

boards/arm64/imx8/imx8qm-mek/configs/nsh/defconfig

@@ -39,7 +39,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_RAMLOG=y
 CONFIG_RAM_SIZE=134217728

boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig

@@ -37,7 +37,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192
 CONFIG_RAMLOG=y

boards/arm64/qemu/qemu-armv8a/configs/citest_smp/defconfig

@@ -35,7 +35,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=16384
 CONFIG_RAMLOG=y

boards/arm64/qemu/qemu-armv8a/configs/nsh/defconfig

@@ -45,7 +45,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192
 CONFIG_RAMLOG=y

boards/arm64/qemu/qemu-armv8a/configs/nsh_fiq/defconfig

@@ -46,7 +46,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192
 CONFIG_RAMLOG=y

boards/arm64/qemu/qemu-armv8a/configs/nsh_gicv2/defconfig

@@ -38,7 +38,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192
 CONFIG_RAMLOG=y

boards/arm64/qemu/qemu-armv8a/configs/nsh_smp/defconfig

@@ -38,7 +38,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=16384
 CONFIG_RAMLOG=y

boards/arm64/qemu/qemu-armv8a/configs/nsh_smp_tickless/defconfig

@@ -36,7 +36,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=16384
 CONFIG_RAMLOG=y

boards/arm64/rk3399/nanopi_m4/configs/nsh/defconfig

@@ -27,6 +27,7 @@ CONFIG_DEBUG_SCHED_WARN=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEFAULT_TASK_STACKSIZE=8192
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_ROMFS=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_LEDS=y
 CONFIG_EXPERIMENTAL=y
@@ -38,11 +39,9 @@ CONFIG_HAVE_CXXINITIALIZE=y
 CONFIG_IDLETHREAD_STACKSIZE=8192
 CONFIG_INIT_ENTRYPOINT="nsh_main"
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192
 CONFIG_RAMLOG=y

boards/arm64/rk3399/nanopi_m4/include/nsh_romfsimg.h

@@ -1,22 +0,0 @@
-/***************************************************************************
- * boards/arm64/rk3399/nanopi_m4/include/nsh_romfsimg.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ***************************************************************************/
-
-extern const unsigned char romfs_img[];
-extern unsigned int romfs_img_len;

boards/arm64/rk3399/nanopi_m4/src/Makefile

@@ -23,10 +23,8 @@ include $(TOPDIR)/Make.defs
 CSRCS = nanopi_m4_boardinit.c
 CSRCS += nanopi_m4_appinit.c
 
-ifeq ($(CONFIG_NSH_ROMFSETC),y)
+ifeq ($(CONFIG_ETC_ROMFS),y)
-ifneq ($(CONFIG_NSH_CUSTOMROMFS),y)
   RCSRCS = etc/init.d/rc.sysinit etc/init.d/rcS
 endif
-endif
 
 include $(TOPDIR)/boards/Board.mk

boards/arm64/rk3399/pinephonepro/configs/nsh/defconfig

@@ -41,7 +41,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PTHREAD_STACK_MIN=8192
 CONFIG_RAMLOG=y

boards/risc-v/esp32c3/esp32c3-devkit-rust-1/include/nsh_romfsimg.h

@@ -1,25 +0,0 @@
-/****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit-rust-1/include/nsh_romfsimg.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __BOARDS_RISCV_ESP32C3_ESP32C3_DEVKIT_RUST1_INCLUDE_NSH_ROMFSIMG_H
-#define __BOARDS_RISCV_ESP32C3_ESP32C3_DEVKIT_RUST1_INCLUDE_NSH_ROMFSIMG_H
-extern const unsigned char romfs_img[];
-extern const unsigned int romfs_img_len;
-#endif

boards/risc-v/esp32c3/esp32c3-devkit/configs/romfs/defconfig

@@ -17,9 +17,12 @@ CONFIG_ARCH_CHIP_ESP32C3WROOM02=y
 CONFIG_ARCH_INTERRUPTSTACK=1536
 CONFIG_ARCH_RISCV=y
 CONFIG_ARCH_STACKDUMP=y
+CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LOOPSPERMSEC=15000
 CONFIG_BUILTIN=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=6
 CONFIG_EXAMPLES_ROMFS=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_ROMFS=y
@@ -30,12 +33,9 @@ CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=6
-CONFIG_NSH_ROMFSETC=y
 CONFIG_NSH_STRERROR=y
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_RR_INTERVAL=200

boards/risc-v/esp32c3/esp32c3-devkit/configs/twai/defconfig

@@ -21,6 +21,7 @@ CONFIG_BOARD_LOOPSPERMSEC=15000
 CONFIG_BUILTIN=y
 CONFIG_DEV_ZERO=y
 CONFIG_ESP32C3_TWAI0=y
+CONFIG_ETC_ROMFS=y
 CONFIG_EXAMPLES_CAN=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_ROMFS=y
@@ -34,7 +35,6 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_NSH_STRERROR=y
 CONFIG_PREALLOC_TIMERS=0
 CONFIG_PRIORITY_INHERITANCE=y

boards/risc-v/esp32c3/esp32c3-devkit/include/nsh_romfsimg.h

@@ -1,25 +0,0 @@
-/****************************************************************************
- * boards/risc-v/esp32c3/esp32c3-devkit/include/nsh_romfsimg.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __BOARDS_RISCV_ESP32C3_ESP32C3_DEVKIT_INCLUDE_NSH_ROMFSIMG_H
-#define __BOARDS_RISCV_ESP32C3_ESP32C3_DEVKIT_INCLUDE_NSH_ROMFSIMG_H
-extern const unsigned char romfs_img[];
-extern const unsigned int romfs_img_len;
-#endif

boards/risc-v/esp32c3/esp32c3-devkit/src/Make.defs

@@ -42,12 +42,10 @@ ifeq ($(CONFIG_BOARDCTL_UNIQUEID),y)
   CSRCS += esp32c3_uid.c
 endif
 
-ifeq ($(CONFIG_NSH_ROMFSETC),y)
+ifeq ($(CONFIG_ETC_ROMFS),y)
-ifneq ($(CONFIG_NSH_CUSTOMROMFS),y)
   RCSRCS = etc/init.d/rc.sysinit etc/init.d/rcS
   RCRAWS = etc/group etc/passwd
 endif
-endif
 
 DEPPATH += --dep-path board
 VPATH += :board

boards/risc-v/esp32c3/esp32c3-devkit/src/etc/init.d/rc.sysinit

@@ -23,14 +23,14 @@
 #define CONCAT_(x, y) x##y
 #define CONCAT(x, y)  CONCAT_(x, y)
 
-#ifdef CONFIG_NSH_ROMFSETC
+#ifdef CONFIG_ETC_ROMFS
 #ifdef CONFIG_FS_FAT
 
 /* Create a RAMDISK and mount it at /tmp */
 
-mkrd -m CONFIG_NSH_FATDEVNO -s CONFIG_NSH_FATSECTSIZE CONFIG_NSH_FATNSECTORS
+mkrd -m CONFIG_ETC_FATDEVNO -s CONFIG_ETC_FATSECTSIZE CONFIG_ETC_FATNSECTORS
-mkfatfs CONCAT(/dev/ram, CONFIG_NSH_FATDEVNO)
+mkfatfs CONCAT(/dev/ram, CONFIG_ETC_FATDEVNO)
-mount -t vfat CONCAT(/dev/ram, CONFIG_NSH_FATDEVNO) CONFIG_NSH_FATMOUNTPT
+mount -t vfat CONCAT(/dev/ram, CONFIG_ETC_FATDEVNO) CONFIG_ETC_FATMOUNTPT
 
 #endif /* CONFIG_FS_FAT */
-#endif /* CONFIG_NSH_ROMFSETC */
+#endif /* CONFIG_ETC_ROMFS */

boards/risc-v/qemu-rv/rv-virt/include/nsh_romfsimg.h

@@ -1,25 +0,0 @@
-/****************************************************************************
- * boards/risc-v/qemu-rv/rv-virt/include/nsh_romfsimg.h
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.  The
- * ASF licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the
- * License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- ****************************************************************************/
-
-#ifndef __BOARDS_RISCV_QEMU_RV_RV_VIRT_INCLUDE_NSH_ROMFSIMG_H
-#define __BOARDS_RISCV_QEMU_RV_RV_VIRT_INCLUDE_NSH_ROMFSIMG_H
-extern const unsigned char romfs_img[];
-extern const unsigned int romfs_img_len;
-#endif

boards/sim/sim/sim/configs/alsa/defconfig

@@ -20,6 +20,9 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
@@ -36,13 +39,9 @@ CONFIG_LIBC_ENVPATH=y
 CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_SCHED_HAVE_PARENT=y

boards/sim/sim/sim/configs/bas/defconfig

@@ -15,6 +15,9 @@ CONFIG_BOARD_LOOPSPERMSEC=0
 CONFIG_BOOT_RUNFROMEXTSRAM=y
 CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
@@ -29,11 +32,8 @@ CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LIBM=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_WAITPID=y

boards/sim/sim/sim/configs/bastest/defconfig

@@ -13,12 +13,16 @@ CONFIG_ARCH_CHIP="sim"
 CONFIG_ARCH_SIM=y
 CONFIG_BOARDCTL_APP_SYMTAB=y
 CONFIG_BOARDCTL_POWEROFF=y
+CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LOOPSPERMSEC=0
 CONFIG_BOOT_RUNFROMEXTSRAM=y
 CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_BASTEST=y
 CONFIG_EXAMPLES_BASTEST_DEVMINOR=6
 CONFIG_EXAMPLES_BASTEST_DEVPATH="/dev/ram6"
@@ -40,16 +44,12 @@ CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LIBC_STRERROR=y
 CONFIG_LIBM=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CONSOLE_LOGIN=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_MOTD=y
 CONFIG_NSH_MOTD_STRING="MOTD: username=admin password=Administrator"
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_SCHED_HAVE_PARENT=y

boards/sim/sim/sim/configs/bluetooth/defconfig

@@ -26,6 +26,9 @@ CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
 CONFIG_DRIVERS_BLUETOOTH=y
 CONFIG_DRIVERS_WIRELESS=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
@@ -47,13 +50,9 @@ CONFIG_NETINIT_NETLOCAL=y
 CONFIG_NET_BLUETOOTH=y
 CONFIG_NET_STATISTICS=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_PREALLOC_MQ_MSGS=64
 CONFIG_READLINE_TABCOMPLETION=y

boards/sim/sim/sim/configs/bthcisock/defconfig

@@ -27,6 +27,9 @@ CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
 CONFIG_DRIVERS_BLUETOOTH=y
 CONFIG_DRIVERS_WIRELESS=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
@@ -48,13 +51,9 @@ CONFIG_NETINIT_NETLOCAL=y
 CONFIG_NET_BLUETOOTH=y
 CONFIG_NET_STATISTICS=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_PREALLOC_MQ_MSGS=64
 CONFIG_READLINE_TABCOMPLETION=y

boards/sim/sim/sim/configs/btuart/defconfig

@@ -17,14 +17,13 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DRIVERS_BLUETOOTH=y
 CONFIG_DRIVERS_WIRELESS=y
+CONFIG_ETC_ROMFS=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_ROMFS=y
 CONFIG_INIT_ENTRYPOINT="nsh_main"
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSETC=y
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_WAITPID=y
 CONFIG_SIM_HCISOCKET=y

boards/sim/sim/sim/configs/citest/defconfig

@@ -26,6 +26,9 @@ CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_GPIO=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_GPIO=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_HELLOXX=y
@@ -59,15 +62,11 @@ CONFIG_LIBC_SCANSET=y
 CONFIG_NET=y
 CONFIG_NET_USRSOCK=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_MOTD=y
 CONFIG_NSH_MOTD_STRING="MOTD: username=admin password=Administrator"
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_PSEUDOFS_ATTRIBUTES=y
 CONFIG_PSEUDOFS_SOFTLINKS=y

boards/sim/sim/sim/configs/crypto/defconfig

@@ -28,6 +28,9 @@ CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_GPIO=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_GPIO=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_FAT_LCNAMES=y
@@ -57,13 +60,9 @@ CONFIG_MBEDTLS_SHA1_ALT=y
 CONFIG_MBEDTLS_SHA256_ALT=y
 CONFIG_MBEDTLS_SHA512_ALT=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_PSEUDOFS_ATTRIBUTES=y
 CONFIG_PSEUDOFS_SOFTLINKS=y

boards/sim/sim/sim/configs/duktape/defconfig

@@ -19,6 +19,9 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
@@ -37,16 +40,12 @@ CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LIBM=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CONSOLE_LOGIN=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_MOTD=y
 CONFIG_NSH_MOTD_STRING="MOTD: username=admin password=Administrator"
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_SCHED_HAVE_PARENT=y

boards/sim/sim/sim/configs/foc/defconfig

@@ -22,6 +22,9 @@ CONFIG_DEBUG_FEATURES=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_FOC=y
 CONFIG_EXAMPLES_FOC_FIXED16_INST=2
 CONFIG_EXAMPLES_FOC_FLOAT_INST=2
@@ -64,15 +67,11 @@ CONFIG_MOTOR_FOC=y
 CONFIG_MOTOR_FOC_DUMMY=y
 CONFIG_MOTOR_FOC_INST=4
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_MOTD=y
 CONFIG_NSH_MOTD_STRING="MOTD: username=admin password=Administrator"
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_SCHED_HAVE_PARENT=y

boards/sim/sim/sim/configs/ipforward/defconfig

@@ -22,6 +22,9 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_IPFORWARD=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
@@ -47,13 +50,9 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_TUN=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_SCHED_HAVE_PARENT=y

boards/sim/sim/sim/configs/libcxxtest/defconfig

@@ -28,6 +28,8 @@ CONFIG_DEBUG_FEATURES=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_HELLOXX=y
 CONFIG_EXAMPLES_NETTEST=y
@@ -71,11 +73,8 @@ CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_NOTIFIER=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_RTC=y

boards/sim/sim/sim/configs/lua/defconfig

@@ -20,6 +20,9 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_LUA_MODULE=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
@@ -45,13 +48,9 @@ CONFIG_LUA_LFS_MODULE=y
 CONFIG_LUA_LSYSLOG_MODULE=y
 CONFIG_LUA_LUV_MODULE=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_PSEUDOFS_ATTRIBUTES=y
 CONFIG_READLINE_CMD_HISTORY=y

boards/sim/sim/sim/configs/matter/defconfig

@@ -25,6 +25,9 @@ CONFIG_DEV_URANDOM=y
 CONFIG_DEV_ZERO=y
 CONFIG_DRIVERS_BLUETOOTH=y
 CONFIG_DRIVERS_WIRELESS=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_GPIO=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_FAT_LCNAMES=y
@@ -93,15 +96,11 @@ CONFIG_NET_UDP=y
 CONFIG_NET_UDP_NOTIFIER=y
 CONFIG_NET_UDP_WRITE_BUFFERS=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_MOTD=y
 CONFIG_NSH_MOTD_STRING="MOTD: username=admin password=Administrator"
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_PSEUDOFS_ATTRIBUTES=y
 CONFIG_PSEUDOFS_SOFTLINKS=y

boards/sim/sim/sim/configs/minibasic/defconfig

@@ -18,6 +18,9 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
@@ -35,13 +38,9 @@ CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LIBM=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_SCHED_HAVE_PARENT=y

boards/sim/sim/sim/configs/minmea/defconfig

@@ -21,6 +21,9 @@ CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_GPIO=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_GPIO=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_FAT_LCNAMES=y
@@ -46,16 +49,12 @@ CONFIG_LIBC_LOCALE_GETTEXT=y
 CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LIBC_NUMBERED_ARGS=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CONSOLE_LOGIN=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_MOTD=y
 CONFIG_NSH_MOTD_STRING="MOTD: username=admin password=Administrator"
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_PSEUDOFS_ATTRIBUTES=y
 CONFIG_PSEUDOFS_SOFTLINKS=y

boards/sim/sim/sim/configs/nimble/defconfig

@@ -29,6 +29,9 @@ CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
 CONFIG_DRIVERS_BLUETOOTH=y
 CONFIG_DRIVERS_WIRELESS=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_NIMBLE=y
 CONFIG_FAT_LCNAMES=y
@@ -53,13 +56,9 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NIMBLE=y
 CONFIG_NIMBLE_ROLE_PERIPHERAL=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_PREALLOC_MQ_MSGS=64
 CONFIG_PTHREAD_MUTEX_TYPES=y

boards/sim/sim/sim/configs/nsh/defconfig

@@ -20,6 +20,9 @@ CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_GPIO=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_GPIO=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_FAT_LCNAMES=y
@@ -44,16 +47,12 @@ CONFIG_LIBC_LOCALE_GETTEXT=y
 CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LIBC_NUMBERED_ARGS=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CONSOLE_LOGIN=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_MOTD=y
 CONFIG_NSH_MOTD_STRING="MOTD: username=admin password=Administrator"
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_PSEUDOFS_ATTRIBUTES=y
 CONFIG_PSEUDOFS_SOFTLINKS=y

boards/sim/sim/sim/configs/nsh2/defconfig

@@ -17,6 +17,9 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DRIVERS_VIDEO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_NX=y
 CONFIG_EXAMPLES_NXHELLO=y
 CONFIG_EXAMPLES_NXHELLO_FONTID=6
@@ -36,10 +39,7 @@ CONFIG_INPUT=y
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_NX=y
 CONFIG_NXFONT_SANS23X27=y
 CONFIG_NXFONT_SANS28X37B=y

boards/sim/sim/sim/configs/nxcamera/defconfig

@@ -22,6 +22,9 @@ CONFIG_DEV_GPIO=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
 CONFIG_DRIVERS_VIDEO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_GPIO=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_FAT_LCNAMES=y
@@ -45,13 +48,9 @@ CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LIBC_NUMBERED_ARGS=y
 CONFIG_LIBYUV=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_PSEUDOFS_ATTRIBUTES=y
 CONFIG_PSEUDOFS_SOFTLINKS=y

boards/sim/sim/sim/configs/nxlines/defconfig

@@ -18,6 +18,9 @@ CONFIG_BOARD_LOOPSPERMSEC=0
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DRIVERS_VIDEO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_NXLINES=y
 CONFIG_EXAMPLES_NXLINES_BGCOLOR=0x00006400
 CONFIG_EXAMPLES_NXLINES_BORDERCOLOR=0x00ffff00
@@ -35,11 +38,8 @@ CONFIG_INIT_ENTRYPOINT="nxlines_main"
 CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_NX=y
 CONFIG_NXFONT_SANS23X27=y
 CONFIG_NXFONT_SANS28X37B=y

boards/sim/sim/sim/configs/nxwm/defconfig

@@ -16,6 +16,9 @@ CONFIG_ARCH_SIM=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DRIVERS_VIDEO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
 CONFIG_FS_FAT=y
@@ -26,11 +29,8 @@ CONFIG_IDLETHREAD_STACKSIZE=8192
 CONFIG_INIT_ENTRYPOINT="nxwm_main"
 CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_MQ_MAXMSGSIZE=64
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_LIBRARY=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_NX=y
 CONFIG_NXFONT_SANS23X27=y
 CONFIG_NXFONT_SANS28X37B=y

boards/sim/sim/sim/configs/posix_test/defconfig

@@ -25,6 +25,9 @@ CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_GPIO=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_GPIO=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_FAT_LCNAMES=y
@@ -58,15 +61,11 @@ CONFIG_LIBC_PASSWD_FILE=y
 CONFIG_MQ_MAXMSGSIZE=64
 CONFIG_NDEBUG=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_MOTD=y
 CONFIG_NSH_MOTD_STRING="MOTD: username=admin password=Administrator"
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_PIPES=y
 CONFIG_PSEUDOFS_ATTRIBUTES=y

boards/sim/sim/sim/configs/romfs/defconfig

@@ -13,12 +13,16 @@ CONFIG_ARCH_CHIP="sim"
 CONFIG_ARCH_SIM=y
 CONFIG_BOARDCTL_APP_SYMTAB=y
 CONFIG_BOARDCTL_POWEROFF=y
+CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LOOPSPERMSEC=0
 CONFIG_BOOT_RUNFROMEXTSRAM=y
 CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_ROMFS=y
 CONFIG_FAT_LCNAMES=y
@@ -36,16 +40,12 @@ CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LIBC_STRERROR=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CONSOLE_LOGIN=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_MOTD=y
 CONFIG_NSH_MOTD_STRING="MOTD: username=admin password=Administrator"
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=6
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_SCHED_HAVE_PARENT=y

boards/sim/sim/sim/configs/rust/defconfig

@@ -20,6 +20,9 @@ CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_GPIO=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_GPIO=y
 CONFIG_EXAMPLES_HELLO_RUST=y
 CONFIG_FAT_LCNAMES=y
@@ -43,16 +46,12 @@ CONFIG_LIBC_LOCALE_CATALOG=y
 CONFIG_LIBC_LOCALE_GETTEXT=y
 CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CONSOLE_LOGIN=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_MOTD=y
 CONFIG_NSH_MOTD_STRING="MOTD: username=admin password=Administrator"
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_PSEUDOFS_ATTRIBUTES=y
 CONFIG_PSEUDOFS_SOFTLINKS=y

boards/sim/sim/sim/configs/segger/defconfig

@@ -22,6 +22,9 @@ CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
 CONFIG_DRIVERS_NOTE=y
 CONFIG_DRIVERS_NOTE_MAX=5
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_GPIO=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_FAT_LCNAMES=y
@@ -46,15 +49,11 @@ CONFIG_LIBC_LOCALE_GETTEXT=y
 CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_NOTE_RTT=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_MOTD=y
 CONFIG_NSH_MOTD_STRING="MOTD: username=admin password=Administrator"
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_PSEUDOFS_ATTRIBUTES=y
 CONFIG_PSEUDOFS_SOFTLINKS=y

boards/sim/sim/sim/configs/smartfs/defconfig

@@ -23,6 +23,8 @@ CONFIG_DEBUG_FS_ERROR=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_FSUTILS_PASSWD=y
 CONFIG_FSUTILS_PASSWD_READONLY=y
@@ -41,7 +43,6 @@ CONFIG_MTD_N25QXXX=y
 CONFIG_MTD_PARTITION=y
 CONFIG_MTD_SMART=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_CONSOLE_LOGIN=y
 CONFIG_NSH_DISABLE_LOSMART=y
@@ -49,8 +50,6 @@ CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_MOTD=y
 CONFIG_NSH_MOTD_STRING="MOTD: username=admin password=Administrator"
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PSEUDOFS_ATTRIBUTES=y
 CONFIG_PSEUDOFS_SOFTLINKS=y
 CONFIG_QSPI_FLASH=y

boards/sim/sim/sim/configs/tcploop/defconfig

@@ -22,6 +22,9 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_TCPBLASTER=y
 CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK=y
 CONFIG_FAT_LCNAMES=y
@@ -49,13 +52,9 @@ CONFIG_NET_TCPBACKLOG=y
 CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_TUN=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_SCHED_HAVE_PARENT=y

boards/sim/sim/sim/configs/toywasm/defconfig

@@ -21,6 +21,8 @@ CONFIG_DEBUG_FEATURES=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_FSUTILS_PASSWD=y
 CONFIG_FSUTILS_PASSWD_READONLY=y
 CONFIG_FS_BINFS=y
@@ -59,11 +61,8 @@ CONFIG_NET_TCP_WRITE_BUFFERS=y
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_NOTIFIER=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_RTC=y

boards/sim/sim/sim/configs/udgram/defconfig

@@ -18,6 +18,9 @@ CONFIG_BOARD_LOOPSPERMSEC=0
 CONFIG_BOOT_RUNFROMEXTSRAM=y
 CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_UDGRAM=y
 CONFIG_EXAMPLES_UDGRAM_CLIENT_STACKSIZE=8192
@@ -36,11 +39,8 @@ CONFIG_NET=y
 CONFIG_NET_LOCAL=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_WAITPID=y

boards/sim/sim/sim/configs/unionfs/defconfig

@@ -11,10 +11,14 @@ CONFIG_ARCH_BOARD="sim"
 CONFIG_ARCH_BOARD_SIM=y
 CONFIG_ARCH_CHIP="sim"
 CONFIG_ARCH_SIM=y
+CONFIG_BOARDCTL_ROMDISK=y
 CONFIG_BOARD_LOOPSPERMSEC=0
 CONFIG_BOOT_RUNFROMEXTSRAM=y
 CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=2
 CONFIG_EXAMPLES_UNIONFS=y
 CONFIG_EXAMPLES_UNIONFS_RAMDEVNO_A=4
 CONFIG_EXAMPLES_UNIONFS_RAMDEVNO_B=5
@@ -32,11 +36,8 @@ CONFIG_LIBC_MAX_EXITFUNS=1
 CONFIG_LIBC_STRERROR=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_WAITPID=y

boards/sim/sim/sim/configs/userfs/defconfig

@@ -20,6 +20,9 @@ CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEV_LOOP=y
 CONFIG_DEV_ZERO=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_USERFS=y
 CONFIG_FAT_LCNAMES=y
 CONFIG_FAT_LFN=y
@@ -39,13 +42,9 @@ CONFIG_NET_LOCAL=y
 CONFIG_NET_LOOPBACK=y
 CONFIG_NET_UDP=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_ARCHROMFS=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_SCHED_HAVE_PARENT=y

boards/sim/sim/sim/configs/ustream/defconfig

@@ -19,6 +19,9 @@ CONFIG_BOARD_LOOPSPERMSEC=0
 CONFIG_BOOT_RUNFROMEXTSRAM=y
 CONFIG_BUILTIN=y
 CONFIG_DEBUG_SYMBOLS=y
+CONFIG_ETC_FATDEVNO=2
+CONFIG_ETC_ROMFS=y
+CONFIG_ETC_ROMFSDEVNO=1
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_USTREAM=y
 CONFIG_FAT_LCNAMES=y
@@ -36,11 +39,8 @@ CONFIG_NET=y
 CONFIG_NET_LOCAL=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
-CONFIG_NSH_FATDEVNO=2
 CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_READLINE=y
-CONFIG_NSH_ROMFSDEVNO=1
-CONFIG_NSH_ROMFSETC=y
 CONFIG_PATH_INITIAL="/bin"
 CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_WAITPID=y