This is an automated email from the ASF dual-hosted git repository. acassis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit b38a6e0f56f04091b55b2e3f0ce44c05696dd677 Author: wangjianyu3 <[email protected]> AuthorDate: Thu Oct 1 18:36:15 2026 +0800 boards/x86_64/qemu-intel64: switch all nsh defconfigs to nxinit Use init_main as the init entry point and enable SYSTEM_NXINIT with the /etc ROMFS, so nxinit starts nsh as the console service. Assisted-by: OpenCode:claude-sonnet-5 Signed-off-by: wangjianyu3 <[email protected]> --- boards/x86_64/qemu/qemu-intel64/configs/earlyfb/defconfig | 7 ++++++- boards/x86_64/qemu/qemu-intel64/configs/fb/defconfig | 7 ++++++- boards/x86_64/qemu/qemu-intel64/configs/jumbo/defconfig | 7 ++++++- boards/x86_64/qemu/qemu-intel64/configs/lvgl/defconfig | 7 ++++++- boards/x86_64/qemu/qemu-intel64/configs/nsh/defconfig | 7 ++++++- boards/x86_64/qemu/qemu-intel64/configs/nsh_pci/defconfig | 6 +++++- boards/x86_64/qemu/qemu-intel64/configs/nsh_pci_smp/defconfig | 6 +++++- boards/x86_64/qemu/qemu-intel64/configs/python/defconfig | 4 +++- 8 files changed, 43 insertions(+), 8 deletions(-) diff --git a/boards/x86_64/qemu/qemu-intel64/configs/earlyfb/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/earlyfb/defconfig index 1ce0f942b37..4d98daa2af6 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/earlyfb/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/earlyfb/defconfig @@ -25,10 +25,14 @@ CONFIG_DEBUG_PCI_INFO=y CONFIG_DEBUG_PCI_WARN=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=4194304 +CONFIG_ETC_ROMFS=y CONFIG_EXAMPLES_HELLO=y +CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y +CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4194304 -CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_ENTRYPOINT="init_main" +CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBM=y CONFIG_MULTBOOT2_FB=y CONFIG_MULTBOOT2_FB_TERM=y @@ -57,4 +61,5 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_CLE=y CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NXINIT=y CONFIG_USEC_PER_TICK=1 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/fb/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/fb/defconfig index d83a14e4564..9def4affbc8 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/fb/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/fb/defconfig @@ -31,15 +31,19 @@ CONFIG_CONSOLE_SYSLOG=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=4194304 CONFIG_DRIVERS_VIDEO=y +CONFIG_ETC_ROMFS=y CONFIG_EXAMPLES_FB=y CONFIG_EXAMPLES_NX=y CONFIG_EXAMPLES_NXDEMO=y CONFIG_EXAMPLES_NXDEMO_BPP=32 CONFIG_EXAMPLES_NXTERM=y CONFIG_EXAMPLES_NXTERM_BPP=32 +CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y +CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4194304 -CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_ENTRYPOINT="init_main" +CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBM=y CONFIG_MQ_MAXMSGSIZE=64 CONFIG_MULTBOOT2_FB=y @@ -65,6 +69,7 @@ CONFIG_START_DAY=3 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NXINIT=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_USEC_PER_TICK=1 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/jumbo/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/jumbo/defconfig index e1247c85efa..2cfcf8ec29d 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/jumbo/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/jumbo/defconfig @@ -49,6 +49,7 @@ CONFIG_DEBUG_PCI_WARN=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=4194304 CONFIG_DEV_SIMPLE_ADDRENV=y +CONFIG_ETC_ROMFS=y CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_HIDKBD=y CONFIG_EXAMPLES_NETPKT=y @@ -62,20 +63,23 @@ CONFIG_EXAMPLES_TCPBLASTER_SERVERIP=0xc0a80801 CONFIG_EXAMPLES_UDPBLASTER=y CONFIG_EXAMPLES_UDPBLASTER_HOSTIP=0xc0a80801 CONFIG_EXAMPLES_UDPBLASTER_TARGETIP=0xc0a80868 +CONFIG_EXPERIMENTAL=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_PROCFS_REGISTER=y +CONFIG_FS_ROMFS=y CONFIG_HIDKBD_STACKSIZE=10240 CONFIG_HIDMOUSE_STACKSIZE=10240 CONFIG_IDLETHREAD_STACKSIZE=4194304 CONFIG_INDUSTRY_NXMODBUS=y -CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_ENTRYPOINT="init_main" CONFIG_INPUT_KEYBOARD_BYTESTREAM=y CONFIG_INTEL64_ONESHOT=y CONFIG_IOB_ALIGNMENT=64 CONFIG_IOB_BUFSIZE=2048 CONFIG_IOB_NBUFFERS=1024 CONFIG_IOB_NCHAINS=255 +CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBC_KBDCODEC=y CONFIG_LIBM=y CONFIG_LOGGING_NXSCOPE=y @@ -139,6 +143,7 @@ CONFIG_START_YEAR=2011 CONFIG_SYSTEM_CLE=y CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NXINIT=y CONFIG_SYSTEM_NXMBCLIENT=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_TCPDUMP=y diff --git a/boards/x86_64/qemu/qemu-intel64/configs/lvgl/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/lvgl/defconfig index 14f4331fa3b..ffe8e2be9f3 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/lvgl/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/lvgl/defconfig @@ -30,11 +30,15 @@ CONFIG_CONSOLE_SYSLOG=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=4194304 CONFIG_DRIVERS_VIDEO=y +CONFIG_ETC_ROMFS=y CONFIG_EXAMPLES_LVGLDEMO=y +CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y +CONFIG_FS_ROMFS=y CONFIG_GRAPHICS_LVGL=y CONFIG_IDLETHREAD_STACKSIZE=4194304 -CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_ENTRYPOINT="init_main" +CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBM=y CONFIG_LV_USE_CLIB_MALLOC=y CONFIG_LV_USE_CLIB_SPRINTF=y @@ -62,6 +66,7 @@ CONFIG_START_DAY=3 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NXINIT=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_USEC_PER_TICK=1 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/nsh/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/nsh/defconfig index 770fa588fbd..617fc712722 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/nsh/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/nsh/defconfig @@ -33,10 +33,14 @@ CONFIG_DEBUG_FEATURES=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=4194304 +CONFIG_ETC_ROMFS=y CONFIG_EXAMPLES_HELLO=y +CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y +CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4194304 -CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_ENTRYPOINT="init_main" +CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBM=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_IFCONFIG=y @@ -56,6 +60,7 @@ CONFIG_START_DAY=3 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NXINIT=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_USEC_PER_TICK=1 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci/defconfig index 2afbc73360b..79d901e1936 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci/defconfig @@ -30,14 +30,17 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=4194304 CONFIG_DEV_SIMPLE_ADDRENV=y +CONFIG_ETC_ROMFS=y CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_ONESHOT=y CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y +CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4194304 -CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_ENTRYPOINT="init_main" CONFIG_INTEL64_HPET_MIN_DELAY=10 CONFIG_INTEL64_ONESHOT=y +CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBM=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_PCI=y @@ -59,4 +62,5 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSLOG_DEVPATH="/dev/S1" CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NXINIT=y CONFIG_TESTING_OSTEST=y diff --git a/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci_smp/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci_smp/defconfig index 12db1a147a3..6e255709198 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci_smp/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci_smp/defconfig @@ -30,15 +30,18 @@ CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=4194304 CONFIG_DEV_SIMPLE_ADDRENV=y +CONFIG_ETC_ROMFS=y CONFIG_EXAMPLES_HELLO=y CONFIG_EXAMPLES_ONESHOT=y CONFIG_EXPERIMENTAL=y CONFIG_FS_PROCFS=y +CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=4194304 -CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_ENTRYPOINT="init_main" CONFIG_INTEL64_HPET_MIN_DELAY=10 CONFIG_INTEL64_ONESHOT=y CONFIG_IOB_NCHAINS=255 +CONFIG_LIBC_EXECFUNCS=y CONFIG_LIBM=y CONFIG_MM_IOB=y CONFIG_NSH_BUILTIN_APPS=y @@ -63,6 +66,7 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSLOG_DEVPATH="/dev/S1" CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NXINIT=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_TESTING_SMP=y diff --git a/boards/x86_64/qemu/qemu-intel64/configs/python/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/python/defconfig index a109a6ebb65..6d646ba53e5 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/python/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/python/defconfig @@ -36,6 +36,7 @@ CONFIG_DEBUG_SYMBOLS=y CONFIG_DEFAULT_TASK_STACKSIZE=4194304 CONFIG_DEV_SIMPLE_ADDRENV=y CONFIG_DEV_URANDOM=y +CONFIG_ETC_ROMFS=y CONFIG_EVENT_FD=y CONFIG_EXPERIMENTAL=y CONFIG_FS_LARGEFILE=y @@ -44,7 +45,7 @@ CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_FS_TMPFS=y CONFIG_IDLETHREAD_STACKSIZE=4194304 -CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_ENTRYPOINT="init_main" CONFIG_INTERPRETERS_CPYTHON=y CONFIG_INTERPRETERS_CPYTHON_STACKSIZE=1048576 CONFIG_IOB_ALIGNMENT=64 @@ -101,6 +102,7 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_DHCPC_RENEW=y CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NXINIT=y CONFIG_SYSTEM_PING=y CONFIG_TIMER_FD=y CONFIG_TLS_NELEM=10
