Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion boards/arm/qemu/qemu-armv7a/configs/full/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ CONFIG_DRIVERS_VIDEO=y
CONFIG_DRIVERS_VIRTIO_GPU=y
CONFIG_DRIVERS_VIRTIO_INPUT=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_ETC_ROMFS=y
CONFIG_EVENT_FD=y
CONFIG_EXAMPLES_FB=y
CONFIG_EXAMPLES_HELLO=y
Expand All @@ -65,7 +66,7 @@ CONFIG_GRAPHICS_INPUT_TOOL=y
CONFIG_GRAPHICS_LVGL=y
CONFIG_HAVE_CXX=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_ENTRYPOINT="init_main"
CONFIG_INPUT_MOUSE_WHEEL=y
CONFIG_INTELHEX_BINARY=y
CONFIG_INTERPRETERS_LUA=y
Expand Down Expand Up @@ -109,6 +110,8 @@ CONFIG_RAM_VSTART=0x40200000
CONFIG_RAW_BINARY=y
CONFIG_READLINE_CMD_HISTORY=y
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_CHILD_STATUS=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_HPWORKPRIORITY=192
CONFIG_SCHED_INSTRUMENTATION=y
CONFIG_SCHED_INSTRUMENTATION_DUMP=y
Expand All @@ -130,6 +133,7 @@ CONFIG_SYSTEM_NOTE=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NXCAMERA=y
CONFIG_SYSTEM_NXCODEC=y
CONFIG_SYSTEM_NXINIT=y
CONFIG_SYSTEM_VI=y
CONFIG_SYSTEM_YMODEM=y
CONFIG_SYSTEM_ZMODEM=y
Expand Down
6 changes: 5 additions & 1 deletion boards/arm/qemu/qemu-armv7a/configs/gdbstub/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ CONFIG_DEBUG_SCHED_INFO=y
CONFIG_DEBUG_SCHED_WARN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_TASK_STACKSIZE=4096
CONFIG_ETC_ROMFS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXPERIMENTAL=y
CONFIG_FLASH_SIZE=127926272
Expand All @@ -36,7 +37,7 @@ CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_ENTRYPOINT="init_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_EXECFUNCS=y
CONFIG_LIB_GDBSTUB=y
Expand All @@ -51,6 +52,8 @@ CONFIG_RAM_VSTART=0x40200000
CONFIG_RAW_BINARY=y
CONFIG_READLINE_CMD_HISTORY=y
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_CHILD_STATUS=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKPRIORITY=192
CONFIG_SERIAL_GDBSTUB=y
Expand All @@ -61,6 +64,7 @@ CONFIG_START_MONTH=4
CONFIG_START_YEAR=2023
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NXINIT=y
CONFIG_SYSTEM_SYSTEM=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
Expand Down
7 changes: 6 additions & 1 deletion boards/arm/qemu/qemu-armv7a/configs/nsh/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,21 @@ CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_TASK_STACKSIZE=4096
CONFIG_ETC_ROMFS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXPERIMENTAL=y
CONFIG_FLASH_SIZE=1048576
CONFIG_FLASH_START=0
CONFIG_FLASH_VSTART=0
CONFIG_FS_HOSTFS=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
CONFIG_FS_TMPFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_ENTRYPOINT="init_main"
CONFIG_LIBC_EXECFUNCS=y
CONFIG_MODULE=y
CONFIG_NSH_BUILTIN_APPS=y
CONFIG_NSH_FILEIOSIZE=512
Expand All @@ -52,6 +55,7 @@ CONFIG_RAM_VSTART=0x40000000
CONFIG_RAW_BINARY=y
CONFIG_READLINE_CMD_HISTORY=y
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_CHILD_STATUS=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKPRIORITY=192
Expand All @@ -62,6 +66,7 @@ CONFIG_START_YEAR=2023
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_GPROF=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NXINIT=y
CONFIG_SYSTEM_SYSTEM=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
Expand Down
6 changes: 5 additions & 1 deletion boards/arm/qemu/qemu-armv7a/configs/rpproxy/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ CONFIG_DRIVERS_VHOST_RNG=y
CONFIG_DRIVERS_VHOST_RPMSG=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_SERIAL=y
CONFIG_ETC_ROMFS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXAMPLES_RPMSGSOCKET=y
CONFIG_EXPERIMENTAL=y
Expand All @@ -63,9 +64,10 @@ CONFIG_FS_ROMFS=y
CONFIG_FS_RPMSGFS=y
CONFIG_FS_TMPFS=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_ENTRYPOINT="init_main"
CONFIG_INIT_STACKSIZE=4096
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_EXECFUNCS=y
CONFIG_LIBC_HOSTNAME="proxy"
CONFIG_LIBC_LOCALE=y
CONFIG_LIBC_LOCALTIME=y
Expand Down Expand Up @@ -94,6 +96,7 @@ CONFIG_RPTUN=y
CONFIG_RPTUN_IVSHMEM=y
CONFIG_RPTUN_IVSHMEM_NAME="0:server:s"
CONFIG_SCHED_BACKTRACE=y
CONFIG_SCHED_CHILD_STATUS=y
CONFIG_SCHED_EVENTS=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_HPWORK=y
Expand Down Expand Up @@ -123,6 +126,7 @@ CONFIG_SYSLOG_TIMESTAMP=y
CONFIG_SYSTEM_CUTERM=y
CONFIG_SYSTEM_DUMPSTACK=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NXINIT=y
CONFIG_UART1_BASE=0x9000000
CONFIG_UART1_IRQ=33
CONFIG_UART1_PL011=y
Expand Down
6 changes: 5 additions & 1 deletion boards/arm/qemu/qemu-armv7a/configs/rpserver/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_RNG=y
CONFIG_DRIVERS_VIRTIO_RPMSG=y
CONFIG_DRIVERS_VIRTIO_SERIAL=y
CONFIG_ETC_ROMFS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXAMPLES_RPMSGSOCKET=y
CONFIG_EXPERIMENTAL=y
Expand All @@ -65,9 +66,10 @@ CONFIG_FS_RPMSGFS=y
CONFIG_FS_RPMSGFS_SERVER=y
CONFIG_FS_TMPFS=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_ENTRYPOINT="init_main"
CONFIG_INIT_STACKSIZE=4096
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_EXECFUNCS=y
CONFIG_LIBC_HOSTNAME="server"
CONFIG_LIBC_LOCALE=y
CONFIG_LIBC_LOCALTIME=y
Expand All @@ -94,6 +96,7 @@ CONFIG_RPTUN=y
CONFIG_RPTUN_IVSHMEM=y
CONFIG_RPTUN_IVSHMEM_NAME="0:proxy:m"
CONFIG_SCHED_BACKTRACE=y
CONFIG_SCHED_CHILD_STATUS=y
CONFIG_SCHED_EVENTS=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_HPWORK=y
Expand Down Expand Up @@ -123,6 +126,7 @@ CONFIG_SYSTEM_CUTERM=y
CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE="/dev/ttyproxy"
CONFIG_SYSTEM_DUMPSTACK=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NXINIT=y
CONFIG_TTY_LAUNCH=y
CONFIG_TTY_LAUNCH_STACKSIZE=2048
CONFIG_TTY_SIGINT=y
Expand Down
6 changes: 5 additions & 1 deletion boards/arm/qemu/qemu-armv7a/configs/smp/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ CONFIG_DEBUG_FEATURES=y
CONFIG_DEBUG_FULLOPT=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_TASK_STACKSIZE=4096
CONFIG_ETC_ROMFS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXPERIMENTAL=y
CONFIG_FLASH_SIZE=127926272
Expand All @@ -32,7 +33,7 @@ CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_ENTRYPOINT="init_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_EXECFUNCS=y
CONFIG_MM_KASAN=y
Expand All @@ -48,6 +49,8 @@ CONFIG_RAM_VSTART=0x40200000
CONFIG_RAW_BINARY=y
CONFIG_READLINE_CMD_HISTORY=y
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_CHILD_STATUS=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKPRIORITY=192
CONFIG_SMP=y
Expand All @@ -57,6 +60,7 @@ CONFIG_START_MONTH=4
CONFIG_START_YEAR=2023
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NXINIT=y
CONFIG_SYSTEM_SYSTEM=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_KASAN=y
Expand Down
1 change: 1 addition & 0 deletions boards/arm/qemu/qemu-armv7a/src/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/etctmp*
14 changes: 14 additions & 0 deletions boards/arm/qemu/qemu-armv7a/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,17 @@ if(CONFIG_LIBC_FDT)
endif()

target_sources(board PRIVATE ${SRCS})

if(CONFIG_ETC_ROMFS AND CONFIG_SYSTEM_NXINIT)
nuttx_add_romfs(
NAME
etc
MOUNTPOINT
etc
RCSRCS
etc/init.d/init.rc
PATH
${CMAKE_CURRENT_BINARY_DIR}/etc)

target_link_libraries(board PRIVATE romfs_etc)
endif()
6 changes: 6 additions & 0 deletions boards/arm/qemu/qemu-armv7a/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ include $(TOPDIR)/Make.defs

CSRCS = qemu_boardinit.c qemu_bringup.c

ifeq ($(CONFIG_ETC_ROMFS),y)
ifeq ($(CONFIG_SYSTEM_NXINIT),y)
RCSRCS += etc/init.d/init.rc
endif
endif

ifeq ($(CONFIG_LIBC_FDT),y)
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)fdt$(DELIM)dtc$(DELIM)libfdt
endif
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* boards/sim/sim/sim/src/etc/init.d/rcS
* boards/arm/qemu/qemu-armv7a/src/etc/init.d/init.rc
*
* SPDX-License-Identifier: Apache-2.0
*
Expand All @@ -22,6 +22,12 @@

#include <nuttx/config.h>

#ifdef CONFIG_FS_HOSTFS
mount -t hostfs -o fs=. /data
#ifdef CONFIG_SYSTEM_NSH
service console sh
restart_period 1000
#endif

on init
#ifdef CONFIG_SYSTEM_NSH
start console
#endif
6 changes: 5 additions & 1 deletion boards/arm64/qemu/qemu-armv8a/configs/fastboot/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,20 @@ CONFIG_DRIVERS_VIRTIO_NET=y
CONFIG_DRIVERS_VIRTIO_RNG=y
CONFIG_DRIVERS_VIRTIO_SERIAL=y
CONFIG_DRIVERS_VIRTIO_SOUND=y
CONFIG_ETC_ROMFS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXPERIMENTAL=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_FATTIME=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
CONFIG_FS_V9FS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=8192
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_ENTRYPOINT="init_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_ALIGNMENT=16
CONFIG_IOB_BUFSIZE=1534
Expand Down Expand Up @@ -97,6 +100,7 @@ CONFIG_SYSTEM_FASTBOOTD=y
CONFIG_SYSTEM_FASTBOOTD_SHELL=y
CONFIG_SYSTEM_FDTDUMP=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NXINIT=y
CONFIG_SYSTEM_NXPLAYER=y
CONFIG_SYSTEM_NXRECORDER=y
CONFIG_SYSTEM_PING=y
Expand Down
7 changes: 6 additions & 1 deletion boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,21 @@ CONFIG_DRIVERS_VIDEO=y
CONFIG_DRIVERS_VIRTIO_GPU=y
CONFIG_DRIVERS_VIRTIO_MMIO=y
CONFIG_DRIVERS_VIRTIO_SERIAL=y
CONFIG_ETC_ROMFS=y
CONFIG_EXAMPLES_FB=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXPERIMENTAL=y
CONFIG_FAT_LCNAMES=y
CONFIG_FAT_LFN=y
CONFIG_FS_FAT=y
CONFIG_FS_FATTIME=y
CONFIG_FS_LARGEFILE=y
CONFIG_FS_PROCFS=y
CONFIG_FS_ROMFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=8192
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_ENTRYPOINT="init_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_IOB_ALIGNMENT=16
CONFIG_IOB_BUFSIZE=1534
Expand All @@ -56,6 +59,7 @@ CONFIG_RAM_START=0x40000000
CONFIG_RAW_BINARY=y
CONFIG_READLINE_CMD_HISTORY=y
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_CHILD_STATUS=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKPRIORITY=192
Expand All @@ -68,6 +72,7 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSLOG_TIMESTAMP=y
CONFIG_SYSTEM_FDTDUMP=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NXINIT=y
CONFIG_SYSTEM_SYSTEM=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
Expand Down
6 changes: 5 additions & 1 deletion boards/arm64/qemu/qemu-armv8a/configs/gdbstub/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ CONFIG_DEBUG_SCHED_WARN=y
CONFIG_DEBUG_SYMBOLS=y
CONFIG_DEFAULT_TASK_STACKSIZE=8192
CONFIG_DEVICE_TREE=y
CONFIG_ETC_ROMFS=y
CONFIG_EXAMPLES_HELLO=y
CONFIG_EXPERIMENTAL=y
CONFIG_FRAME_POINTER=y
Expand All @@ -39,7 +40,7 @@ CONFIG_FS_TMPFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y
CONFIG_IDLETHREAD_STACKSIZE=8192
CONFIG_INIT_ENTRYPOINT="nsh_main"
CONFIG_INIT_ENTRYPOINT="init_main"
CONFIG_INTELHEX_BINARY=y
CONFIG_LIBC_EXECFUNCS=y
CONFIG_LIBC_MEMFD_ERROR=y
Expand All @@ -57,6 +58,8 @@ CONFIG_RAM_START=0x40000000
CONFIG_RAW_BINARY=y
CONFIG_READLINE_CMD_HISTORY=y
CONFIG_RR_INTERVAL=200
CONFIG_SCHED_CHILD_STATUS=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKPRIORITY=192
CONFIG_SERIAL_GDBSTUB=y
Expand All @@ -68,6 +71,7 @@ CONFIG_START_YEAR=2022
CONFIG_SYMTAB_ORDEREDBYNAME=y
CONFIG_SYSTEM_GPROF=y
CONFIG_SYSTEM_NSH=y
CONFIG_SYSTEM_NXINIT=y
CONFIG_SYSTEM_SYSTEM=y
CONFIG_TESTING_GETPRIME=y
CONFIG_TESTING_OSTEST=y
Expand Down
Loading
Loading