You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/04/17 15:25:02 UTC
[incubator-nuttx] branch master updated (28e55ab -> 43989ee)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 28e55ab doc: sem_timedwait: No need to include time.h
new c758cb8 sim/romfs: add etctmp into ignore list
new 3dd0945 sim/nsh2: remove the specific Make.defs
new 3776bf6 sim/configs: update the defconfig
new 43989ee sim/nsh2: fix nxserver stack overflow
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
boards/sim/sim/sim/configs/bas/defconfig | 1 -
boards/sim/sim/sim/configs/bluetooth/defconfig | 1 -
boards/sim/sim/sim/configs/configdata/defconfig | 1 -
boards/sim/sim/sim/configs/cxxtest/defconfig | 1 -
boards/sim/sim/sim/configs/dsptest/defconfig | 1 -
boards/sim/sim/sim/configs/fb/defconfig | 1 -
boards/sim/sim/sim/configs/ipforward/defconfig | 1 -
boards/sim/sim/sim/configs/minibasic/defconfig | 1 -
boards/sim/sim/sim/configs/mount/defconfig | 1 -
boards/sim/sim/sim/configs/mtdpart/defconfig | 1 -
boards/sim/sim/sim/configs/mtdrwb/defconfig | 1 -
boards/sim/sim/sim/configs/nettest/defconfig | 1 -
boards/sim/sim/sim/configs/nsh/defconfig | 1 -
boards/sim/sim/sim/configs/nsh2/Make.defs | 147 -----------------------
boards/sim/sim/sim/configs/nsh2/defconfig | 1 +
boards/sim/sim/sim/configs/nx/defconfig | 1 -
boards/sim/sim/sim/configs/nx11/defconfig | 1 -
boards/sim/sim/sim/configs/nxffs/defconfig | 1 -
boards/sim/sim/sim/configs/nxlines/defconfig | 1 -
boards/sim/sim/sim/configs/nxwm/defconfig | 1 -
boards/sim/sim/sim/configs/spiffs/defconfig | 1 -
boards/sim/sim/sim/configs/tcpblaster/defconfig | 1 -
boards/sim/sim/sim/configs/tcploop/defconfig | 1 -
boards/sim/sim/sim/configs/touchscreen/defconfig | 1 -
boards/sim/sim/sim/configs/udgram/defconfig | 1 -
boards/sim/sim/sim/configs/unionfs/defconfig | 1 -
boards/sim/sim/sim/configs/userfs/defconfig | 1 -
boards/sim/sim/sim/configs/ustream/defconfig | 1 -
boards/sim/sim/sim/src/.gitignore | 1 +
29 files changed, 2 insertions(+), 173 deletions(-)
delete mode 100644 boards/sim/sim/sim/configs/nsh2/Make.defs
[incubator-nuttx] 03/04: sim/configs: update the defconfig
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 3776bf685034f03ff9cbcd1b7e208c85d410ad56
Author: chao.an <an...@xiaomi.com>
AuthorDate: Fri Apr 17 17:17:48 2020 +0800
sim/configs: update the defconfig
Signed-off-by: chao.an <an...@xiaomi.com>
---
boards/sim/sim/sim/configs/bas/defconfig | 1 -
boards/sim/sim/sim/configs/bluetooth/defconfig | 1 -
boards/sim/sim/sim/configs/configdata/defconfig | 1 -
boards/sim/sim/sim/configs/cxxtest/defconfig | 1 -
boards/sim/sim/sim/configs/dsptest/defconfig | 1 -
boards/sim/sim/sim/configs/fb/defconfig | 1 -
boards/sim/sim/sim/configs/ipforward/defconfig | 1 -
boards/sim/sim/sim/configs/minibasic/defconfig | 1 -
boards/sim/sim/sim/configs/mount/defconfig | 1 -
boards/sim/sim/sim/configs/mtdpart/defconfig | 1 -
boards/sim/sim/sim/configs/mtdrwb/defconfig | 1 -
boards/sim/sim/sim/configs/nettest/defconfig | 1 -
boards/sim/sim/sim/configs/nsh/defconfig | 1 -
boards/sim/sim/sim/configs/nx/defconfig | 1 -
boards/sim/sim/sim/configs/nx11/defconfig | 1 -
boards/sim/sim/sim/configs/nxffs/defconfig | 1 -
boards/sim/sim/sim/configs/nxlines/defconfig | 1 -
boards/sim/sim/sim/configs/nxwm/defconfig | 1 -
boards/sim/sim/sim/configs/spiffs/defconfig | 1 -
boards/sim/sim/sim/configs/tcpblaster/defconfig | 1 -
boards/sim/sim/sim/configs/tcploop/defconfig | 1 -
boards/sim/sim/sim/configs/touchscreen/defconfig | 1 -
boards/sim/sim/sim/configs/udgram/defconfig | 1 -
boards/sim/sim/sim/configs/unionfs/defconfig | 1 -
boards/sim/sim/sim/configs/userfs/defconfig | 1 -
boards/sim/sim/sim/configs/ustream/defconfig | 1 -
26 files changed, 26 deletions(-)
diff --git a/boards/sim/sim/sim/configs/bas/defconfig b/boards/sim/sim/sim/configs/bas/defconfig
index 798b97a..ef9a20e 100644
--- a/boards/sim/sim/sim/configs/bas/defconfig
+++ b/boards/sim/sim/sim/configs/bas/defconfig
@@ -35,7 +35,6 @@ CONFIG_NSH_READLINE=y
CONFIG_NSH_ROMFSDEVNO=1
CONFIG_NSH_ROMFSETC=y
CONFIG_PATH_INITIAL="/bin"
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
diff --git a/boards/sim/sim/sim/configs/bluetooth/defconfig b/boards/sim/sim/sim/configs/bluetooth/defconfig
index 2dca351..96ff7db 100644
--- a/boards/sim/sim/sim/configs/bluetooth/defconfig
+++ b/boards/sim/sim/sim/configs/bluetooth/defconfig
@@ -60,7 +60,6 @@ CONFIG_NSH_ROMFSETC=y
CONFIG_PATH_INITIAL="/bin"
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048
CONFIG_PREALLOC_MQ_MSGS=64
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_READLINE_TABCOMPLETION=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
diff --git a/boards/sim/sim/sim/configs/configdata/defconfig b/boards/sim/sim/sim/configs/configdata/defconfig
index bcf620a..cf831cc 100644
--- a/boards/sim/sim/sim/configs/configdata/defconfig
+++ b/boards/sim/sim/sim/configs/configdata/defconfig
@@ -27,7 +27,6 @@ CONFIG_MTD_BYTE_WRITE=y
CONFIG_MTD_CONFIG=y
CONFIG_NFILE_DESCRIPTORS=32
CONFIG_PLATFORM_CONFIGDATA=y
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_RAMMTD=y
CONFIG_RAMMTD_BLOCKSIZE=256
CONFIG_RAMMTD_FLASHSIM=y
diff --git a/boards/sim/sim/sim/configs/cxxtest/defconfig b/boards/sim/sim/sim/configs/cxxtest/defconfig
index 1542b10..48325b9 100644
--- a/boards/sim/sim/sim/configs/cxxtest/defconfig
+++ b/boards/sim/sim/sim/configs/cxxtest/defconfig
@@ -18,7 +18,6 @@ CONFIG_LIBM=y
CONFIG_MAX_TASKS=64
CONFIG_NFILE_DESCRIPTORS=32
CONFIG_PTHREAD_MUTEX_TYPES=y
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_RAM_START=0x00000000
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_ONEXIT_MAX=4
diff --git a/boards/sim/sim/sim/configs/dsptest/defconfig b/boards/sim/sim/sim/configs/dsptest/defconfig
index 1f72d3f..2e3e134 100644
--- a/boards/sim/sim/sim/configs/dsptest/defconfig
+++ b/boards/sim/sim/sim/configs/dsptest/defconfig
@@ -27,7 +27,6 @@ CONFIG_MAX_TASKS=64
CONFIG_MQ_MAXMSGSIZE=64
CONFIG_NFILE_DESCRIPTORS=32
CONFIG_PREALLOC_MQ_MSGS=4
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_SCHED_WAITPID=y
CONFIG_SDCLONE_DISABLE=y
CONFIG_START_DAY=6
diff --git a/boards/sim/sim/sim/configs/fb/defconfig b/boards/sim/sim/sim/configs/fb/defconfig
index 7956269..da138f7 100644
--- a/boards/sim/sim/sim/configs/fb/defconfig
+++ b/boards/sim/sim/sim/configs/fb/defconfig
@@ -19,7 +19,6 @@ CONFIG_DRIVERS_VIDEO=y
CONFIG_EXAMPLES_FB=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_MAX_TASKS=16
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_SDCLONE_DISABLE=y
CONFIG_SIM_FRAMEBUFFER=y
CONFIG_START_DAY=28
diff --git a/boards/sim/sim/sim/configs/ipforward/defconfig b/boards/sim/sim/sim/configs/ipforward/defconfig
index 70b2ca9..e2013fd 100644
--- a/boards/sim/sim/sim/configs/ipforward/defconfig
+++ b/boards/sim/sim/sim/configs/ipforward/defconfig
@@ -59,7 +59,6 @@ CONFIG_NSH_ROMFSDEVNO=1
CONFIG_NSH_ROMFSETC=y
CONFIG_PATH_INITIAL="/bin"
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_READLINE_TABCOMPLETION=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_LPWORK=y
diff --git a/boards/sim/sim/sim/configs/minibasic/defconfig b/boards/sim/sim/sim/configs/minibasic/defconfig
index 856e5bd..835110a 100644
--- a/boards/sim/sim/sim/configs/minibasic/defconfig
+++ b/boards/sim/sim/sim/configs/minibasic/defconfig
@@ -46,7 +46,6 @@ CONFIG_NSH_ROMFSDEVNO=1
CONFIG_NSH_ROMFSETC=y
CONFIG_PATH_INITIAL="/bin"
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_READLINE_TABCOMPLETION=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
diff --git a/boards/sim/sim/sim/configs/mount/defconfig b/boards/sim/sim/sim/configs/mount/defconfig
index 90e0c23..9e5c3bc 100644
--- a/boards/sim/sim/sim/configs/mount/defconfig
+++ b/boards/sim/sim/sim/configs/mount/defconfig
@@ -18,7 +18,6 @@ CONFIG_FS_FAT=y
CONFIG_IDLETHREAD_STACKSIZE=4096
CONFIG_MAX_TASKS=64
CONFIG_NFILE_DESCRIPTORS=32
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_SDCLONE_DISABLE=y
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2008
diff --git a/boards/sim/sim/sim/configs/mtdpart/defconfig b/boards/sim/sim/sim/configs/mtdpart/defconfig
index 39b5331..084a38c 100644
--- a/boards/sim/sim/sim/configs/mtdpart/defconfig
+++ b/boards/sim/sim/sim/configs/mtdpart/defconfig
@@ -22,7 +22,6 @@ CONFIG_MAX_TASKS=64
CONFIG_MTD=y
CONFIG_MTD_PARTITION=y
CONFIG_NFILE_DESCRIPTORS=32
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_RAMMTD=y
CONFIG_RAMMTD_FLASHSIM=y
CONFIG_SDCLONE_DISABLE=y
diff --git a/boards/sim/sim/sim/configs/mtdrwb/defconfig b/boards/sim/sim/sim/configs/mtdrwb/defconfig
index db4394a..9b633af 100644
--- a/boards/sim/sim/sim/configs/mtdrwb/defconfig
+++ b/boards/sim/sim/sim/configs/mtdrwb/defconfig
@@ -25,7 +25,6 @@ CONFIG_MTD_PARTITION=y
CONFIG_MTD_READAHEAD=y
CONFIG_MTD_WRBUFFER=y
CONFIG_NFILE_DESCRIPTORS=32
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_RAMMTD=y
CONFIG_RAMMTD_FLASHSIM=y
CONFIG_SCHED_HPWORK=y
diff --git a/boards/sim/sim/sim/configs/nettest/defconfig b/boards/sim/sim/sim/configs/nettest/defconfig
index d6d1c2a..1e961d7 100644
--- a/boards/sim/sim/sim/configs/nettest/defconfig
+++ b/boards/sim/sim/sim/configs/nettest/defconfig
@@ -26,7 +26,6 @@ CONFIG_NET_STATISTICS=y
CONFIG_NET_TCP=y
CONFIG_NET_TCP_CONNS=40
CONFIG_NFILE_DESCRIPTORS=32
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_SDCLONE_DISABLE=y
CONFIG_START_DAY=16
CONFIG_START_MONTH=8
diff --git a/boards/sim/sim/sim/configs/nsh/defconfig b/boards/sim/sim/sim/configs/nsh/defconfig
index 5cd75c8..d05367b 100644
--- a/boards/sim/sim/sim/configs/nsh/defconfig
+++ b/boards/sim/sim/sim/configs/nsh/defconfig
@@ -48,7 +48,6 @@ CONFIG_NSH_ROMFSDEVNO=1
CONFIG_NSH_ROMFSETC=y
CONFIG_PATH_INITIAL="/bin"
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_READLINE_TABCOMPLETION=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
diff --git a/boards/sim/sim/sim/configs/nx/defconfig b/boards/sim/sim/sim/configs/nx/defconfig
index bc9e8e3..1697990 100644
--- a/boards/sim/sim/sim/configs/nx/defconfig
+++ b/boards/sim/sim/sim/configs/nx/defconfig
@@ -26,7 +26,6 @@ CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y
CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_PREALLOC_MQ_MSGS=4
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_SDCLONE_DISABLE=y
CONFIG_SIM_FRAMEBUFFER=y
CONFIG_START_DAY=28
diff --git a/boards/sim/sim/sim/configs/nx11/defconfig b/boards/sim/sim/sim/configs/nx11/defconfig
index 319448f..f531d67 100644
--- a/boards/sim/sim/sim/configs/nx11/defconfig
+++ b/boards/sim/sim/sim/configs/nx11/defconfig
@@ -25,7 +25,6 @@ CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y
CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_PREALLOC_MQ_MSGS=4
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_SDCLONE_DISABLE=y
CONFIG_SIM_FBBPP=32
CONFIG_SIM_FRAMEBUFFER=y
diff --git a/boards/sim/sim/sim/configs/nxffs/defconfig b/boards/sim/sim/sim/configs/nxffs/defconfig
index 5f3776b..7d85737 100644
--- a/boards/sim/sim/sim/configs/nxffs/defconfig
+++ b/boards/sim/sim/sim/configs/nxffs/defconfig
@@ -22,7 +22,6 @@ CONFIG_MAX_TASKS=64
CONFIG_MTD=y
CONFIG_NFILE_DESCRIPTORS=32
CONFIG_NXFFS_SCAN_VOLUME=y
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_RAMMTD=y
CONFIG_RAMMTD_FLASHSIM=y
CONFIG_SDCLONE_DISABLE=y
diff --git a/boards/sim/sim/sim/configs/nxlines/defconfig b/boards/sim/sim/sim/configs/nxlines/defconfig
index 9218689..3891b9f 100644
--- a/boards/sim/sim/sim/configs/nxlines/defconfig
+++ b/boards/sim/sim/sim/configs/nxlines/defconfig
@@ -48,7 +48,6 @@ CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y
CONFIG_NX_XYINPUT_MOUSE=y
CONFIG_PREALLOC_MQ_MSGS=4
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
CONFIG_SDCLONE_DISABLE=y
diff --git a/boards/sim/sim/sim/configs/nxwm/defconfig b/boards/sim/sim/sim/configs/nxwm/defconfig
index 45f760c..4ff47f1 100644
--- a/boards/sim/sim/sim/configs/nxwm/defconfig
+++ b/boards/sim/sim/sim/configs/nxwm/defconfig
@@ -46,7 +46,6 @@ CONFIG_NXWM_NXTERM_STACKSIZE=8192
CONFIG_NXWM_TASKBAR_LEFT=y
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_HPWORKPRIORITY=192
CONFIG_SCHED_ONEXIT=y
diff --git a/boards/sim/sim/sim/configs/spiffs/defconfig b/boards/sim/sim/sim/configs/spiffs/defconfig
index 9a390aa..29bbd69 100644
--- a/boards/sim/sim/sim/configs/spiffs/defconfig
+++ b/boards/sim/sim/sim/configs/spiffs/defconfig
@@ -23,7 +23,6 @@ CONFIG_LIB_RAND_ORDER=3
CONFIG_MAX_TASKS=64
CONFIG_MTD=y
CONFIG_NFILE_DESCRIPTORS=32
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_RAMMTD=y
CONFIG_RAMMTD_FLASHSIM=y
CONFIG_SDCLONE_DISABLE=y
diff --git a/boards/sim/sim/sim/configs/tcpblaster/defconfig b/boards/sim/sim/sim/configs/tcpblaster/defconfig
index 5f9f4c8..1ea976d 100644
--- a/boards/sim/sim/sim/configs/tcpblaster/defconfig
+++ b/boards/sim/sim/sim/configs/tcpblaster/defconfig
@@ -97,7 +97,6 @@ CONFIG_PSEUDOTERM_BSD=y
CONFIG_PTHREAD_CLEANUP=y
CONFIG_PTHREAD_CLEANUP_STACKSIZE=2
CONFIG_PTHREAD_MUTEX_TYPES=y
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_RAMMTD=y
CONFIG_READLINE_CMD_HISTORY=y
CONFIG_READLINE_TABCOMPLETION=y
diff --git a/boards/sim/sim/sim/configs/tcploop/defconfig b/boards/sim/sim/sim/configs/tcploop/defconfig
index c09bf53..a3cde57 100644
--- a/boards/sim/sim/sim/configs/tcploop/defconfig
+++ b/boards/sim/sim/sim/configs/tcploop/defconfig
@@ -61,7 +61,6 @@ CONFIG_NSH_ROMFSDEVNO=1
CONFIG_NSH_ROMFSETC=y
CONFIG_PATH_INITIAL="/bin"
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=8192
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_READLINE_TABCOMPLETION=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_LPWORK=y
diff --git a/boards/sim/sim/sim/configs/touchscreen/defconfig b/boards/sim/sim/sim/configs/touchscreen/defconfig
index aa0a899..fbb60c0 100644
--- a/boards/sim/sim/sim/configs/touchscreen/defconfig
+++ b/boards/sim/sim/sim/configs/touchscreen/defconfig
@@ -25,7 +25,6 @@ CONFIG_NX=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NX_KBD=y
CONFIG_NX_XYINPUT_MOUSE=y
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_SDCLONE_DISABLE=y
CONFIG_SIM_FBBPP=32
CONFIG_SIM_FBHEIGHT=320
diff --git a/boards/sim/sim/sim/configs/udgram/defconfig b/boards/sim/sim/sim/configs/udgram/defconfig
index 20f7986..797ba51 100644
--- a/boards/sim/sim/sim/configs/udgram/defconfig
+++ b/boards/sim/sim/sim/configs/udgram/defconfig
@@ -43,7 +43,6 @@ CONFIG_NSH_READLINE=y
CONFIG_NSH_ROMFSDEVNO=1
CONFIG_NSH_ROMFSETC=y
CONFIG_PATH_INITIAL="/bin"
-CONFIG_PTHREAD_STACK_DEFAULT=8192
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/unionfs/defconfig
index 72c1302..83cab21 100644
--- a/boards/sim/sim/sim/configs/unionfs/defconfig
+++ b/boards/sim/sim/sim/configs/unionfs/defconfig
@@ -37,7 +37,6 @@ CONFIG_NSH_READLINE=y
CONFIG_NSH_ROMFSDEVNO=1
CONFIG_NSH_ROMFSETC=y
CONFIG_PATH_INITIAL="/bin"
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
diff --git a/boards/sim/sim/sim/configs/userfs/defconfig b/boards/sim/sim/sim/configs/userfs/defconfig
index 3bd0aa8..5e066ef 100644
--- a/boards/sim/sim/sim/configs/userfs/defconfig
+++ b/boards/sim/sim/sim/configs/userfs/defconfig
@@ -51,7 +51,6 @@ CONFIG_NSH_ROMFSDEVNO=1
CONFIG_NSH_ROMFSETC=y
CONFIG_PATH_INITIAL="/bin"
CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=2048
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_READLINE_TABCOMPLETION=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_LPWORK=y
diff --git a/boards/sim/sim/sim/configs/ustream/defconfig b/boards/sim/sim/sim/configs/ustream/defconfig
index 109351a..081db7d 100644
--- a/boards/sim/sim/sim/configs/ustream/defconfig
+++ b/boards/sim/sim/sim/configs/ustream/defconfig
@@ -43,7 +43,6 @@ CONFIG_NSH_READLINE=y
CONFIG_NSH_ROMFSDEVNO=1
CONFIG_NSH_ROMFSETC=y
CONFIG_PATH_INITIAL="/bin"
-CONFIG_PTHREAD_STACK_DEFAULT=8192
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
[incubator-nuttx] 04/04: sim/nsh2: fix nxserver stack overflow
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 43989ee36f820fb5301445da66ca5fba6f5a1042
Author: chao.an <an...@xiaomi.com>
AuthorDate: Fri Apr 17 17:21:06 2020 +0800
sim/nsh2: fix nxserver stack overflow
increase nxserver stack size to 4K
Signed-off-by: chao.an <an...@xiaomi.com>
---
boards/sim/sim/sim/configs/nsh2/defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/boards/sim/sim/sim/configs/nsh2/defconfig b/boards/sim/sim/sim/configs/nsh2/defconfig
index 5c16b7a..ae060e8 100644
--- a/boards/sim/sim/sim/configs/nsh2/defconfig
+++ b/boards/sim/sim/sim/configs/nsh2/defconfig
@@ -43,6 +43,7 @@ CONFIG_NSH_ROMFSETC=y
CONFIG_NX=y
CONFIG_NXFONT_SANS23X27=y
CONFIG_NXFONT_SANS28X37B=y
+CONFIG_NXSTART_SERVERSTACK=4096
CONFIG_NX_BLOCKING=y
CONFIG_NX_KBD=y
CONFIG_NX_XYINPUT_MOUSE=y
[incubator-nuttx] 02/04: sim/nsh2: remove the specific Make.defs
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 3dd094520c816d3e1ded768db9933475091fb62b
Author: chao.an <an...@xiaomi.com>
AuthorDate: Fri Apr 17 17:25:18 2020 +0800
sim/nsh2: remove the specific Make.defs
Change-Id: If9204619c343993cecbf92c1b8d64a48480110e8
Signed-off-by: chao.an <an...@xiaomi.com>
---
boards/sim/sim/sim/configs/nsh2/Make.defs | 147 ------------------------------
1 file changed, 147 deletions(-)
diff --git a/boards/sim/sim/sim/configs/nsh2/Make.defs b/boards/sim/sim/sim/configs/nsh2/Make.defs
deleted file mode 100644
index 04f5f97..0000000
--- a/boards/sim/sim/sim/configs/nsh2/Make.defs
+++ /dev/null
@@ -1,147 +0,0 @@
-############################################################################
-# boards/sim/sim/sim/configs/nsh2/Make.defs
-#
-# 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 ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-
-HOSTOS = ${shell uname -o 2>/dev/null || uname -s 2>/dev/null || echo "Other"}
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
- ARCHOPTIMIZATION = -g
-endif
-
-ifneq ($(CONFIG_DEBUG_NOOPT),y)
- ARCHOPTIMIZATION += -O2 -fno-strict-aliasing
-endif
-
-ARCHCPUFLAGS = -fno-builtin
-ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions -fcheck-new -fno-rtti
-ARCHPICFLAGS = -fpic
-ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
-ARCHWARNINGSXX = -Wall -Wshadow -Wundef
-ARCHDEFINES =
-ARCHDEFINESXX = -DCONFIG_WCHAR_BUILTIN
-ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-ARCHINCLUDESXX = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-ARCHSCRIPT =
-
-# Add -fno-common because macOS "ld -r" doesn't seem to pick objects
-# for common symbols.
-ARCHCPUFLAGS += -fno-common
-ARCHCPUFLAGSXX += -fno-common
-
-ifeq ($(CONFIG_SIM_M32),y)
- ARCHCPUFLAGS += -m32
- ARCHCPUFLAGSXX += -m32
-endif
-
-CROSSDEV =
-CC = $(CROSSDEV)cc
-CXX = $(CROSSDEV)c++
-CPP = $(CROSSDEV)cc -E
-LD = $(CROSSDEV)ld
-AR = $(CROSSDEV)ar rcs
-NM = $(CROSSDEV)nm
-OBJCOPY = $(CROSSDEV)objcopy
-OBJDUMP = $(CROSSDEV)objdump
-
-CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
- $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
-CXXFLAGS = $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
- $(ARCHCPUFLAGSXX) $(ARCHINCLUDESXX) $(ARCHDEFINESXX) $(EXTRAFLAGS) -pipe
-CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
-AFLAGS = $(CFLAGS) -D__ASSEMBLY__
-
-# Loadable module definitions
-
-CMODULEFLAGS = $(CFLAGS)
-# -fno-pic to avoid GOT relocations
-CMODULEFLAGS += -fno-pic
-
-LDMODULEFLAGS = -r -e module_initialize
-ifeq ($(WINTOOL),y)
- LDMODULEFLAGS += -T "${shell cygpath -w $(TOPDIR)/libs/libc/modlib/gnu-elf.ld}"
-else
- LDMODULEFLAGS += -T $(TOPDIR)/libs/libc/modlib/gnu-elf.ld
-endif
-
-# NuttX modules are ELF binaries.
-# Non-ELF platforms like macOS need to use a separate ELF toolchain.
-ifeq ($(CONFIG_HOST_MACOS),y)
- # eg. brew install x86_64-elf-gcc
- MODULECC = x86_64-elf-gcc
- MODULELD = x86_64-elf-ld
- MODULESTRIP = x86_64-elf-strip --strip-unneeded
- # It seems macOS/x86_64 loads the program text around 00000001_xxxxxxxx.
- # The gcc default (-mcmodel=small) would produce out-of-range 32-bit
- # relocations.
- CMODULEFLAGS += -mcmodel=large
-endif
-
-# ELF module definitions
-
-CELFFLAGS = $(CFLAGS)
-CXXELFFLAGS = $(CXXFLAGS)
-# -fno-pic to avoid GOT relocations
-CELFFLAGS += -fno-pic
-CXXELFFLAGS += -fno-pic
-
-LDELFFLAGS = -r -e main
-ifeq ($(WINTOOL),y)
- LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}"
-else
- LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld
-endif
-
-
-ASMEXT = .S
-OBJEXT = .o
-LIBEXT = .a
-
-ifeq ($(HOSTOS),Cygwin)
- EXEEXT = .exe
-else
- EXEEXT =
-endif
-
-LDLINKFLAGS = $(ARCHSCRIPT) # Link flags used with $(LD)
-CCLINKFLAGS = $(ARCHSCRIPT) # Link flags used with $(CC)
-LDFLAGS = $(ARCHSCRIPT) # For backward compatibility, same as CCLINKFLAGS
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
- CCLINKFLAGS += -g
-endif
-
-ifeq ($(CONFIG_SIM_M32),y)
- LDLINKFLAGS += -melf_i386
- CCLINKFLAGS += -m32
- LDFLAGS += -m32
- LDMODULEFLAGS += -melf_i386
- LDELFFLAGS += -melf_i386
- HOSTLDFLAGS += -m32
-endif
-
-
-MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
-
-HOSTCC = cc
-HOSTINCLUDES = -I.
-HOSTCFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
- $(ARCHCPUFLAGS) $(HOSTINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
[incubator-nuttx] 01/04: sim/romfs: add etctmp into ignore list
Posted by gn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit c758cb8341121f022d5172f67fb0973f4e0e516c
Author: chao.an <an...@xiaomi.com>
AuthorDate: Fri Apr 17 16:06:36 2020 +0800
sim/romfs: add etctmp into ignore list
Signed-off-by: chao.an <an...@xiaomi.com>
Change-Id: I8d6828882a7a52cb7ec61af8f288c1910167cd0b
---
boards/sim/sim/sim/src/.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/boards/sim/sim/sim/src/.gitignore b/boards/sim/sim/sim/src/.gitignore
index 726d936..1c4606b 100644
--- a/boards/sim/sim/sim/src/.gitignore
+++ b/boards/sim/sim/sim/src/.gitignore
@@ -1,2 +1,3 @@
/.depend
/Make.dep
+/etctmp*