diff --git a/boards/x86/qemu/qemu-i486/configs/nsh/defconfig b/boards/x86/qemu/qemu-i486/configs/nsh/defconfig index 2d9696102bf..c45e59fa84b 100644 --- a/boards/x86/qemu/qemu-i486/configs/nsh/defconfig +++ b/boards/x86/qemu/qemu-i486/configs/nsh/defconfig @@ -27,12 +27,15 @@ CONFIG_BOOT_RUNFROMEXTSRAM=y CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y +CONFIG_ETC_ROMFS=y CONFIG_EXAMPLES_HELLO=y +CONFIG_EXPERIMENTAL=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 -CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_ENTRYPOINT="init_main" +CONFIG_LIBC_EXECFUNCS=y CONFIG_LINE_MAX=64 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_IFUPDOWN=y @@ -42,9 +45,12 @@ CONFIG_PTHREAD_MUTEX_TYPES=y CONFIG_RAM_SIZE=1048576 CONFIG_RAM_START=0x00100000 CONFIG_READLINE_CMD_HISTORY=y +CONFIG_SCHED_CHILD_STATUS=y +CONFIG_SCHED_HAVE_PARENT=y CONFIG_SCHED_WAITPID=y CONFIG_START_DAY=3 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y +CONFIG_SYSTEM_NXINIT=y CONFIG_TESTING_OSTEST=y diff --git a/boards/x86/qemu/qemu-i486/configs/vga_fb/defconfig b/boards/x86/qemu/qemu-i486/configs/vga_fb/defconfig index 6be9f88641b..536c0e13092 100644 --- a/boards/x86/qemu/qemu-i486/configs/vga_fb/defconfig +++ b/boards/x86/qemu/qemu-i486/configs/vga_fb/defconfig @@ -28,15 +28,18 @@ CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y CONFIG_DEBUG_SYMBOLS=y CONFIG_DRIVERS_VIDEO=y +CONFIG_ETC_ROMFS=y CONFIG_EXAMPLES_FB=y CONFIG_EXAMPLES_HELLO=y +CONFIG_EXPERIMENTAL=y CONFIG_FS_FAT=y CONFIG_FS_PROCFS=y CONFIG_FS_ROMFS=y CONFIG_IDLETHREAD_STACKSIZE=2048 -CONFIG_INIT_ENTRYPOINT="nsh_main" +CONFIG_INIT_ENTRYPOINT="init_main" CONFIG_LCD=y CONFIG_LCD_FRAMEBUFFER=y +CONFIG_LIBC_EXECFUNCS=y CONFIG_LINE_MAX=64 CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_IFUPDOWN=y @@ -47,10 +50,13 @@ CONFIG_QEMU_VGA=y CONFIG_RAM_SIZE=1048576 CONFIG_RAM_START=0x00100000 CONFIG_READLINE_CMD_HISTORY=y +CONFIG_SCHED_CHILD_STATUS=y +CONFIG_SCHED_HAVE_PARENT=y CONFIG_SCHED_WAITPID=y 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_VIDEO_FB=y diff --git a/boards/x86/qemu/qemu-i486/src/.gitignore b/boards/x86/qemu/qemu-i486/src/.gitignore new file mode 100644 index 00000000000..1baf09ba3ae --- /dev/null +++ b/boards/x86/qemu/qemu-i486/src/.gitignore @@ -0,0 +1 @@ +/etctmp* diff --git a/boards/x86/qemu/qemu-i486/src/Makefile b/boards/x86/qemu/qemu-i486/src/Makefile index 2620a6beda1..91f399b1994 100644 --- a/boards/x86/qemu/qemu-i486/src/Makefile +++ b/boards/x86/qemu/qemu-i486/src/Makefile @@ -28,4 +28,10 @@ ifeq ($(CONFIG_QEMU_VGA),y) CSRCS += qemu_vga_lcd.c endif +ifeq ($(CONFIG_ETC_ROMFS),y) +ifeq ($(CONFIG_SYSTEM_NXINIT),y) + RCSRCS += etc/init.d/init.rc +endif +endif + include $(TOPDIR)/boards/Board.mk diff --git a/boards/x86/qemu/qemu-i486/src/etc/init.d/init.rc b/boards/x86/qemu/qemu-i486/src/etc/init.d/init.rc new file mode 100644 index 00000000000..461ac9276c3 --- /dev/null +++ b/boards/x86/qemu/qemu-i486/src/etc/init.d/init.rc @@ -0,0 +1,33 @@ +/**************************************************************************** + * boards/x86/qemu/qemu-i486/src/etc/init.d/init.rc + * + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +#include + +#ifdef CONFIG_SYSTEM_NSH +service console sh + restart_period 1000 +#endif + +on init +#ifdef CONFIG_SYSTEM_NSH + start console +#endif