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/05/12 11:42:26 UTC
[incubator-nuttx] branch master updated: Apps Issue #246: Replace
romdisk_register() with boardctl(BOARDIOC_ROMDISK) C file changes:
examples/bastest/bastest_main.c, examples/elf/elf_main.c,
examples/module/module_main.c, examples/posix_spawn/spawn_main.c,
examples/romfs/romfs_main.c, examples/sotest/sotest_main.c,
examples/unionfs/unionfs_main.c
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
The following commit(s) were added to refs/heads/master by this push:
new 3156aa7 Apps Issue #246: Replace romdisk_register() with boardctl(BOARDIOC_ROMDISK) C file changes: examples/bastest/bastest_main.c, examples/elf/elf_main.c, examples/module/module_main.c, examples/posix_spawn/spawn_main.c, examples/romfs/romfs_main.c, examples/sotest/sotest_main.c, examples/unionfs/unionfs_main.c
3156aa7 is described below
commit 3156aa7532c5097c96f3394071904c7f91723e33
Author: Tanushree Baindur <ta...@gmail.com>
AuthorDate: Sat May 8 13:49:38 2021 -0500
Apps Issue #246: Replace romdisk_register() with boardctl(BOARDIOC_ROMDISK)
C file changes:
examples/bastest/bastest_main.c, examples/elf/elf_main.c,
examples/module/module_main.c, examples/posix_spawn/spawn_main.c,
examples/romfs/romfs_main.c, examples/sotest/sotest_main.c,
examples/unionfs/unionfs_main.c
Corresponding defconfig files added/modified to test above changes:
new file: boards/sim/sim/sim/configs/bastest/defconfig
new file: boards/sim/sim/sim/configs/elf/defconfig
modified: boards/sim/sim/sim/configs/module/defconfig
new file: boards/sim/sim/sim/configs/posix_spawn/defconfig
new file: boards/sim/sim/sim/configs/romfs/defconfig
modified: boards/sim/sim/sim/configs/sotest/defconfig
modified: boards/sim/sim/sim/configs/unionfs/defconfig
modified: boards/sim/sim/sim/configs/module32/defconfig
modified: boards/sim/sim/sim/configs/sotest32/defconfig
---
.../sim/sim/configs/{unionfs => bastest}/defconfig | 24 +++++++++++++++---
.../sim/sim/sim/configs/{unionfs => elf}/defconfig | 28 +++++++++++++++------
boards/sim/sim/sim/configs/module/defconfig | 3 ++-
boards/sim/sim/sim/configs/module32/defconfig | 3 ++-
.../sim/configs/{unionfs => posix_spawn}/defconfig | 29 ++++++++++++++++------
.../sim/sim/configs/{unionfs => romfs}/defconfig | 22 ++++++++++++----
boards/sim/sim/sim/configs/sotest/defconfig | 3 ++-
boards/sim/sim/sim/configs/sotest32/defconfig | 3 ++-
boards/sim/sim/sim/configs/unionfs/defconfig | 1 +
9 files changed, 87 insertions(+), 29 deletions(-)
diff --git a/boards/sim/sim/sim/configs/unionfs/defconfig b/boards/sim/sim/sim/configs/bastest/defconfig
similarity index 65%
copy from boards/sim/sim/sim/configs/unionfs/defconfig
copy to boards/sim/sim/sim/configs/bastest/defconfig
index 6bf932b..30ad75d 100644
--- a/boards/sim/sim/sim/configs/unionfs/defconfig
+++ b/boards/sim/sim/sim/configs/bastest/defconfig
@@ -11,31 +11,47 @@ CONFIG_ARCH_BOARD="sim"
CONFIG_ARCH_BOARD_SIM=y
CONFIG_ARCH_CHIP="sim"
CONFIG_ARCH_SIM=y
+CONFIG_BOARDCTL_APP_SYMTAB=y
+CONFIG_BOARDCTL_POWEROFF=y
CONFIG_BOARD_LOOPSPERMSEC=0
CONFIG_BOOT_RUNFROMEXTSRAM=y
CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
-CONFIG_EXAMPLES_UNIONFS=y
-CONFIG_EXAMPLES_UNIONFS_RAMDEVNO_A=4
-CONFIG_EXAMPLES_UNIONFS_RAMDEVNO_B=5
+CONFIG_DEV_LOOP=y
+CONFIG_DEV_ZERO=y
+CONFIG_EXAMPLES_BASTEST=y
+CONFIG_EXAMPLES_BASTEST_DEVMINOR=6
+CONFIG_EXAMPLES_BASTEST_DEVPATH="/dev/ram6"
+CONFIG_EXAMPLES_HELLO=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
+CONFIG_FSUTILS_PASSWD=y
+CONFIG_FSUTILS_PASSWD_READONLY=y
+CONFIG_FS_BINFS=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
-CONFIG_FS_UNIONFS=y
CONFIG_IDLETHREAD_STACKSIZE=4096
+CONFIG_INTERPRETERS_BAS=y
CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIBC_STRERROR=y
+CONFIG_LIBM=y
CONFIG_LIB_ENVPATH=y
CONFIG_MAX_TASKS=64
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_POSIX_SPAWN_PROXY_STACKSIZE=2048
+CONFIG_READLINE_TABCOMPLETION=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
diff --git a/boards/sim/sim/sim/configs/unionfs/defconfig b/boards/sim/sim/sim/configs/elf/defconfig
similarity index 63%
copy from boards/sim/sim/sim/configs/unionfs/defconfig
copy to boards/sim/sim/sim/configs/elf/defconfig
index 6bf932b..20dad3e 100644
--- a/boards/sim/sim/sim/configs/unionfs/defconfig
+++ b/boards/sim/sim/sim/configs/elf/defconfig
@@ -11,31 +11,43 @@ CONFIG_ARCH_BOARD="sim"
CONFIG_ARCH_BOARD_SIM=y
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_EXAMPLES_UNIONFS=y
-CONFIG_EXAMPLES_UNIONFS_RAMDEVNO_A=4
-CONFIG_EXAMPLES_UNIONFS_RAMDEVNO_B=5
+CONFIG_DEV_LOOP=y
+CONFIG_DEV_ZERO=y
+CONFIG_ELF=y
+CONFIG_EXAMPLES_ELF=y
+CONFIG_EXAMPLES_ELF_DEVMINOR=6
+CONFIG_EXAMPLES_ELF_DEVPATH="/dev/ram6"
+CONFIG_EXAMPLES_HELLO=y
+CONFIG_EXECFUNCS_HAVE_SYMTAB=y
+CONFIG_EXECFUNCS_SYSTEM_SYMTAB=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
+CONFIG_FSUTILS_PASSWD=y
+CONFIG_FSUTILS_PASSWD_READONLY=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
-CONFIG_FS_UNIONFS=y
+CONFIG_HOST_X86=y
CONFIG_IDLETHREAD_STACKSIZE=4096
-CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIBC_STRERROR=y
CONFIG_LIB_ENVPATH=y
CONFIG_MAX_TASKS=64
CONFIG_NSH_ARCHINIT=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_POSIX_SPAWN_PROXY_STACKSIZE=2048
+CONFIG_READLINE_TABCOMPLETION=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
diff --git a/boards/sim/sim/sim/configs/module/defconfig b/boards/sim/sim/sim/configs/module/defconfig
index 60eca11..e5495d1 100644
--- a/boards/sim/sim/sim/configs/module/defconfig
+++ b/boards/sim/sim/sim/configs/module/defconfig
@@ -13,6 +13,7 @@ CONFIG_ARCH_CHIP="sim"
CONFIG_ARCH_SIM=y
CONFIG_BINFMT_DISABLE=y
CONFIG_BOARDCTL_POWEROFF=y
+CONFIG_BOARDCTL_ROMDISK=y
CONFIG_BOARD_LOOPSPERMSEC=0
CONFIG_BOOT_RUNFROMEXTSRAM=y
CONFIG_BUILTIN=y
@@ -25,9 +26,9 @@ CONFIG_EXAMPLES_MODULE_DEVPATH="/dev/ram4"
CONFIG_FSUTILS_PASSWD=y
CONFIG_FSUTILS_PASSWD_READONLY=y
CONFIG_FS_ROMFS=y
-CONFIG_HOST_MACOS=y
CONFIG_IOB_NOTIFIER=y
CONFIG_LIBC_DLFCN=y
+CONFIG_LIBC_STRERROR=y
CONFIG_LIB_ENVPATH=y
CONFIG_MAX_TASKS=64
CONFIG_MM_FILL_ALLOCATIONS=y
diff --git a/boards/sim/sim/sim/configs/module32/defconfig b/boards/sim/sim/sim/configs/module32/defconfig
index e724d6a..94c69b2 100644
--- a/boards/sim/sim/sim/configs/module32/defconfig
+++ b/boards/sim/sim/sim/configs/module32/defconfig
@@ -13,6 +13,7 @@ CONFIG_ARCH_CHIP="sim"
CONFIG_ARCH_SIM=y
CONFIG_BINFMT_DISABLE=y
CONFIG_BOARDCTL_POWEROFF=y
+CONFIG_BOARDCTL_ROMDISK=y
CONFIG_BOARD_LOOPSPERMSEC=0
CONFIG_BOOT_RUNFROMEXTSRAM=y
CONFIG_BUILTIN=y
@@ -25,9 +26,9 @@ CONFIG_EXAMPLES_MODULE_DEVPATH="/dev/ram4"
CONFIG_FSUTILS_PASSWD=y
CONFIG_FSUTILS_PASSWD_READONLY=y
CONFIG_FS_ROMFS=y
-CONFIG_HOST_MACOS=y
CONFIG_IOB_NOTIFIER=y
CONFIG_LIBC_DLFCN=y
+CONFIG_LIBC_STRERROR=y
CONFIG_LIB_ENVPATH=y
CONFIG_MAX_TASKS=64
CONFIG_MM_FILL_ALLOCATIONS=y
diff --git a/boards/sim/sim/sim/configs/unionfs/defconfig b/boards/sim/sim/sim/configs/posix_spawn/defconfig
similarity index 61%
copy from boards/sim/sim/sim/configs/unionfs/defconfig
copy to boards/sim/sim/sim/configs/posix_spawn/defconfig
index 6bf932b..debe0e7 100644
--- a/boards/sim/sim/sim/configs/unionfs/defconfig
+++ b/boards/sim/sim/sim/configs/posix_spawn/defconfig
@@ -11,31 +11,44 @@ CONFIG_ARCH_BOARD="sim"
CONFIG_ARCH_BOARD_SIM=y
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_EXAMPLES_UNIONFS=y
-CONFIG_EXAMPLES_UNIONFS_RAMDEVNO_A=4
-CONFIG_EXAMPLES_UNIONFS_RAMDEVNO_B=5
+CONFIG_DEV_LOOP=y
+CONFIG_DEV_ZERO=y
+CONFIG_ELF=y
+CONFIG_EXAMPLES_HELLO=y
+CONFIG_EXAMPLES_POSIXSPAWN=y
+CONFIG_EXAMPLES_POSIXSPAWN_DEVMINOR=8
+CONFIG_EXAMPLES_POSIXSPAWN_DEVPATH="/dev/ram8"
+CONFIG_EXECFUNCS_HAVE_SYMTAB=y
+CONFIG_EXECFUNCS_SYSTEM_SYMTAB=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
+CONFIG_FSUTILS_PASSWD=y
+CONFIG_FSUTILS_PASSWD_READONLY=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
-CONFIG_FS_UNIONFS=y
+CONFIG_HOST_X86=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIBC_STRERROR=y
CONFIG_LIB_ENVPATH=y
CONFIG_MAX_TASKS=64
CONFIG_NSH_ARCHINIT=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_PATH_INITIAL="/mnt/romfs"
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048
+CONFIG_READLINE_TABCOMPLETION=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
diff --git a/boards/sim/sim/sim/configs/unionfs/defconfig b/boards/sim/sim/sim/configs/romfs/defconfig
similarity index 69%
copy from boards/sim/sim/sim/configs/unionfs/defconfig
copy to boards/sim/sim/sim/configs/romfs/defconfig
index 6bf932b..48095e3 100644
--- a/boards/sim/sim/sim/configs/unionfs/defconfig
+++ b/boards/sim/sim/sim/configs/romfs/defconfig
@@ -11,31 +11,43 @@ CONFIG_ARCH_BOARD="sim"
CONFIG_ARCH_BOARD_SIM=y
CONFIG_ARCH_CHIP="sim"
CONFIG_ARCH_SIM=y
+CONFIG_BOARDCTL_APP_SYMTAB=y
+CONFIG_BOARDCTL_POWEROFF=y
CONFIG_BOARD_LOOPSPERMSEC=0
CONFIG_BOOT_RUNFROMEXTSRAM=y
CONFIG_BUILTIN=y
CONFIG_DEBUG_SYMBOLS=y
-CONFIG_EXAMPLES_UNIONFS=y
-CONFIG_EXAMPLES_UNIONFS_RAMDEVNO_A=4
-CONFIG_EXAMPLES_UNIONFS_RAMDEVNO_B=5
+CONFIG_DEV_LOOP=y
+CONFIG_DEV_ZERO=y
+CONFIG_EXAMPLES_HELLO=y
+CONFIG_EXAMPLES_ROMFS=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
+CONFIG_FSUTILS_PASSWD=y
+CONFIG_FSUTILS_PASSWD_READONLY=y
+CONFIG_FS_BINFS=y
CONFIG_FS_FAT=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
-CONFIG_FS_UNIONFS=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIBC_STRERROR=y
CONFIG_LIB_ENVPATH=y
CONFIG_MAX_TASKS=64
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_ROMFSDEVNO=6
CONFIG_NSH_ROMFSETC=y
CONFIG_PATH_INITIAL="/bin"
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048
+CONFIG_READLINE_TABCOMPLETION=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
diff --git a/boards/sim/sim/sim/configs/sotest/defconfig b/boards/sim/sim/sim/configs/sotest/defconfig
index 363d1a0..f38c951 100644
--- a/boards/sim/sim/sim/configs/sotest/defconfig
+++ b/boards/sim/sim/sim/configs/sotest/defconfig
@@ -13,6 +13,7 @@ CONFIG_ARCH_CHIP="sim"
CONFIG_ARCH_SIM=y
CONFIG_BINFMT_DISABLE=y
CONFIG_BOARDCTL_POWEROFF=y
+CONFIG_BOARDCTL_ROMDISK=y
CONFIG_BOARD_LOOPSPERMSEC=0
CONFIG_BOOT_RUNFROMEXTSRAM=y
CONFIG_BUILTIN=y
@@ -25,9 +26,9 @@ CONFIG_EXAMPLES_SOTEST_DEVPATH="/dev/ram3"
CONFIG_FSUTILS_PASSWD=y
CONFIG_FSUTILS_PASSWD_READONLY=y
CONFIG_FS_ROMFS=y
-CONFIG_HOST_MACOS=y
CONFIG_IOB_NOTIFIER=y
CONFIG_LIBC_DLFCN=y
+CONFIG_LIBC_STRERROR=y
CONFIG_LIB_ENVPATH=y
CONFIG_MAX_TASKS=64
CONFIG_MM_FILL_ALLOCATIONS=y
diff --git a/boards/sim/sim/sim/configs/sotest32/defconfig b/boards/sim/sim/sim/configs/sotest32/defconfig
index eb9136a..8903ef6 100644
--- a/boards/sim/sim/sim/configs/sotest32/defconfig
+++ b/boards/sim/sim/sim/configs/sotest32/defconfig
@@ -13,6 +13,7 @@ CONFIG_ARCH_CHIP="sim"
CONFIG_ARCH_SIM=y
CONFIG_BINFMT_DISABLE=y
CONFIG_BOARDCTL_POWEROFF=y
+CONFIG_BOARDCTL_ROMDISK=y
CONFIG_BOARD_LOOPSPERMSEC=0
CONFIG_BOOT_RUNFROMEXTSRAM=y
CONFIG_BUILTIN=y
@@ -25,9 +26,9 @@ CONFIG_EXAMPLES_SOTEST_DEVPATH="/dev/ram3"
CONFIG_FSUTILS_PASSWD=y
CONFIG_FSUTILS_PASSWD_READONLY=y
CONFIG_FS_ROMFS=y
-CONFIG_HOST_MACOS=y
CONFIG_IOB_NOTIFIER=y
CONFIG_LIBC_DLFCN=y
+CONFIG_LIBC_STRERROR=y
CONFIG_LIB_ENVPATH=y
CONFIG_MAX_TASKS=64
CONFIG_MM_FILL_ALLOCATIONS=y
diff --git a/boards/sim/sim/sim/configs/unionfs/defconfig b/boards/sim/sim/sim/configs/unionfs/defconfig
index 6bf932b..963331d 100644
--- a/boards/sim/sim/sim/configs/unionfs/defconfig
+++ b/boards/sim/sim/sim/configs/unionfs/defconfig
@@ -26,6 +26,7 @@ CONFIG_FS_ROMFS=y
CONFIG_FS_UNIONFS=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_LIBC_EXECFUNCS=y
+CONFIG_LIBC_STRERROR=y
CONFIG_LIB_ENVPATH=y
CONFIG_MAX_TASKS=64
CONFIG_NSH_ARCHINIT=y