diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-04-27 22:34:08 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-04-27 22:34:08 +0200 |
| commit | 3dd45b9d3467ee62ac0d604a5607baaa10089ac3 (patch) | |
| tree | 7bf56e57c71bcfedc47a7af9be4bab290beb21da /nuttx-configs | |
| parent | 7b06d781d8ade137a1837a3ecf002579bddfbb14 (diff) | |
| parent | bd1c3363df44170523c68fd87ee19f2582a5e8fc (diff) | |
| download | px4-firmware-beta.tar.gz px4-firmware-beta.tar.bz2 px4-firmware-beta.zip | |
Merge branch 'master' into betabeta
Diffstat (limited to 'nuttx-configs')
| -rw-r--r-- | nuttx-configs/aerocore/nsh/defconfig | 2 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 4 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nuttx-configs/aerocore/nsh/defconfig b/nuttx-configs/aerocore/nsh/defconfig index 08ff4a988..e314bf1d8 100644 --- a/nuttx-configs/aerocore/nsh/defconfig +++ b/nuttx-configs/aerocore/nsh/defconfig @@ -403,7 +403,7 @@ CONFIG_SIG_SIGWORK=4 CONFIG_MAX_TASKS=32 CONFIG_MAX_TASK_ARGS=10 CONFIG_NPTHREAD_KEYS=4 -CONFIG_NFILE_DESCRIPTORS=36 +CONFIG_NFILE_DESCRIPTORS=42 CONFIG_NFILE_STREAMS=8 CONFIG_NAME_MAX=32 CONFIG_PREALLOC_MQ_MSGS=4 diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index 389cb5ab5..2c9a21f21 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -326,7 +326,7 @@ CONFIG_DRAM_START=0x20000000 CONFIG_DRAM_SIZE=196608 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y # The actual usage is 420 bytes -CONFIG_ARCH_INTERRUPTSTACK=1500 +CONFIG_ARCH_INTERRUPTSTACK=750 # # Boot options @@ -405,7 +405,7 @@ CONFIG_SIG_SIGWORK=4 CONFIG_MAX_TASKS=32 CONFIG_MAX_TASK_ARGS=10 CONFIG_NPTHREAD_KEYS=4 -CONFIG_NFILE_DESCRIPTORS=44 +CONFIG_NFILE_DESCRIPTORS=42 CONFIG_NFILE_STREAMS=8 CONFIG_NAME_MAX=32 CONFIG_PREALLOC_MQ_MSGS=4 diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index d331aa26a..4ccc5dacb 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -439,7 +439,7 @@ CONFIG_SIG_SIGWORK=4 CONFIG_MAX_TASKS=32 CONFIG_MAX_TASK_ARGS=10 CONFIG_NPTHREAD_KEYS=4 -CONFIG_NFILE_DESCRIPTORS=44 +CONFIG_NFILE_DESCRIPTORS=42 CONFIG_NFILE_STREAMS=8 CONFIG_NAME_MAX=32 CONFIG_PREALLOC_MQ_MSGS=4 |