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

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/include/nsh_romfsimg.h → 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/include/nsh_romfsimg.h → 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/include/nsh_romfsimg.h → 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/include/nsh_romfsimg.h → 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/include/nsh_romfsimg.h → 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