[incubator-nuttx] 03/06: MPFS: Add knsh (CONFIG_BUILD_KERNEL=y)

[xi...@apache.org]

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 2287ebcbcf6f4a723a4609316c8dddbef3c6cddd
Author: Ville Juven <vi...@unikie.com>
AuthorDate: Wed Apr 13 10:15:30 2022 +0300

    MPFS: Add knsh (CONFIG_BUILD_KERNEL=y)
    
    Re-name the old knsh (CONFIG_BUILD_PROTECTED=y) to pnsh
---
 boards/risc-v/mpfs/icicle/configs/knsh/defconfig   | 42 ++++++++++++++--------
 .../mpfs/icicle/configs/{knsh => pnsh}/defconfig   |  3 +-
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig
index 9223c2e221..b024092042 100644
--- a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig
+++ b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig
@@ -7,21 +7,34 @@
 #
 # CONFIG_DISABLE_OS_API is not set
 # CONFIG_NSH_DISABLE_LOSMART is not set
+# CONFIG_TLS_ALIGNED is not set
 CONFIG_ARCH="risc-v"
+CONFIG_ARCH_ADDRENV=y
 CONFIG_ARCH_BOARD="icicle"
 CONFIG_ARCH_BOARD_COMMON=y
 CONFIG_ARCH_BOARD_ICICLE_MPFS=y
 CONFIG_ARCH_CHIP="mpfs"
 CONFIG_ARCH_CHIP_MPFS250T_FCVG484=y
 CONFIG_ARCH_CHIP_MPFS=y
+CONFIG_ARCH_DATA_NPAGES=0
+CONFIG_ARCH_DATA_VBASE=0xC0000000
+CONFIG_ARCH_HEAP_NPAGES=0
+CONFIG_ARCH_HEAP_VBASE=0x00000000
 CONFIG_ARCH_INTERRUPTSTACK=2048
+CONFIG_ARCH_PGPOOL_MAPPING=y
+CONFIG_ARCH_PGPOOL_PBASE=0x80200000
+CONFIG_ARCH_PGPOOL_SIZE=4194304
+CONFIG_ARCH_PGPOOL_VBASE=0x80200000
 CONFIG_ARCH_RISCV=y
 CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARCH_TEXT_NPAGES=0
+CONFIG_ARCH_TEXT_VBASE=0x00000000
 CONFIG_ARCH_USE_MMU=y
 CONFIG_ARCH_USE_MPU=y
+CONFIG_ARCH_USE_S_MODE=y
+CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=54000
-CONFIG_BUILD_PROTECTED=y
-CONFIG_BUILTIN=y
+CONFIG_BUILD_KERNEL=y
 CONFIG_DEBUG_ASSERTIONS=y
 CONFIG_DEBUG_ERROR=y
 CONFIG_DEBUG_FEATURES=y
@@ -30,52 +43,53 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEBUG_WARN=y
 CONFIG_DEV_ZERO=y
+CONFIG_ELF=y
+CONFIG_ELF_STACKSIZE=4096
+CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_ROMFS=y
 CONFIG_IDLETHREAD_STACKSIZE=2048
-CONFIG_INIT_ENTRYPOINT="nsh_main"
 CONFIG_INIT_STACKSIZE=3072
 CONFIG_INTELHEX_BINARY=y
+CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBC_FLOATINGPOINT=y
 CONFIG_LIBC_HOSTNAME="icicle"
 CONFIG_LIBC_PERROR_STDOUT=y
 CONFIG_LIBC_STRERROR=y
 CONFIG_MEMSET_64BIT=y
 CONFIG_MEMSET_OPTSPEED=y
+CONFIG_MM_PGALLOC=y
 CONFIG_MPFS_ENABLE_DPFPU=y
+CONFIG_MPFS_ROMFS_MOUNT=y
 CONFIG_MPFS_UART1=y
 CONFIG_NSH_ARCHINIT=y
-CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
 CONFIG_NSH_DISABLE_MKDIR=y
 CONFIG_NSH_DISABLE_RM=y
 CONFIG_NSH_DISABLE_RMDIR=y
 CONFIG_NSH_DISABLE_UMOUNT=y
+CONFIG_NSH_FILE_APPS=y
 CONFIG_NSH_LINELEN=160
 CONFIG_NSH_STRERROR=y
-CONFIG_NUTTX_USERSPACE=0x80040000
-CONFIG_PASS1_BUILDIR="boards/risc-v/mpfs/common/kernel"
 CONFIG_PREALLOC_TIMERS=4
-CONFIG_RAM_SIZE=262144
-CONFIG_RAM_START=0x80080000
+CONFIG_RAM_SIZE=1048576
+CONFIG_RAM_START=0x80100000
 CONFIG_RAW_BINARY=y
 CONFIG_READLINE_CMD_HISTORY=y
-CONFIG_READLINE_TABCOMPLETION=y
 CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_HAVE_PARENT=y
 CONFIG_SCHED_HPWORK=y
 CONFIG_SCHED_LPWORK=y
+CONFIG_SCHED_ONEXIT=y
+CONFIG_SCHED_ONEXIT_MAX=2
 CONFIG_SCHED_WAITPID=y
 CONFIG_SERIAL_NPOLLWAITERS=2
 CONFIG_STACK_COLORATION=y
 CONFIG_START_MONTH=4
 CONFIG_START_YEAR=2021
-CONFIG_SYSLOG_COLOR_OUTPUT=y
 CONFIG_SYSTEM_CLE_CMD_HISTORY=y
-CONFIG_SYSTEM_COLOR_CLE=y
 CONFIG_SYSTEM_NSH=y
+CONFIG_SYSTEM_NSH_PROGNAME="init"
 CONFIG_SYSTEM_TIME64=y
-CONFIG_TASK_NAME_SIZE=20
-CONFIG_TESTING_GETPRIME=y
-CONFIG_TESTING_OSTEST=y
 CONFIG_UART1_SERIAL_CONSOLE=y
diff --git a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig b/boards/risc-v/mpfs/icicle/configs/pnsh/defconfig
similarity index 97%
copy from boards/risc-v/mpfs/icicle/configs/knsh/defconfig
copy to boards/risc-v/mpfs/icicle/configs/pnsh/defconfig
index 9223c2e221..6b48e335e1 100644
--- a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig
+++ b/boards/risc-v/mpfs/icicle/configs/pnsh/defconfig
@@ -30,6 +30,7 @@ CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_SYMBOLS=y
 CONFIG_DEBUG_WARN=y
 CONFIG_DEV_ZERO=y
+CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_FS_PROCFS=y
 CONFIG_FS_ROMFS=y
@@ -70,9 +71,7 @@ CONFIG_SERIAL_NPOLLWAITERS=2
 CONFIG_STACK_COLORATION=y
 CONFIG_START_MONTH=4
 CONFIG_START_YEAR=2021
-CONFIG_SYSLOG_COLOR_OUTPUT=y
 CONFIG_SYSTEM_CLE_CMD_HISTORY=y
-CONFIG_SYSTEM_COLOR_CLE=y
 CONFIG_SYSTEM_NSH=y
 CONFIG_SYSTEM_TIME64=y
 CONFIG_TASK_NAME_SIZE=20