diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-22 08:49:51 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-02-11 07:40:57 +0100 |
| commit | fbaafe63401bded7b6b51f62092091bfa6fa842d (patch) | |
| tree | e77c5032cfcff234ec7dd138b71d845e6b5000ca | |
| parent | f273c6a68f39fb5c4c79032dbf75641a89c01581 (diff) | |
| download | px4-firmware-fbaafe63401bded7b6b51f62092091bfa6fa842d.tar.gz px4-firmware-fbaafe63401bded7b6b51f62092091bfa6fa842d.tar.bz2 px4-firmware-fbaafe63401bded7b6b51f62092091bfa6fa842d.zip | |
Fix merge fail in nuttx configs, adjust LP and HP work stack sizes, reduce interrupt stack from excessive 4K to 2K
| -rw-r--r-- | nuttx-configs/aerocore/nsh/defconfig | 6 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v1/nsh/defconfig | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nuttx-configs/aerocore/nsh/defconfig b/nuttx-configs/aerocore/nsh/defconfig index e44e19a36..80df3bebb 100644 --- a/nuttx-configs/aerocore/nsh/defconfig +++ b/nuttx-configs/aerocore/nsh/defconfig @@ -331,7 +331,7 @@ CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_DRAM_START=0x20000000 CONFIG_DRAM_SIZE=262144 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y -CONFIG_ARCH_INTERRUPTSTACK=4096 +CONFIG_ARCH_INTERRUPTSTACK=2048 # # Boot options @@ -414,8 +414,8 @@ CONFIG_PREALLOC_TIMERS=50 # # Stack and heap information # -CONFIG_IDLETHREAD_STACKSIZE=6000 -CONFIG_USERMAIN_STACKSIZE=4096 +CONFIG_IDLETHREAD_STACKSIZE=3500 +CONFIG_USERMAIN_STACKSIZE=2600 CONFIG_PTHREAD_STACK_MIN=512 CONFIG_PTHREAD_STACK_DEFAULT=2048 diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig index 708160af7..a40816868 100644 --- a/nuttx-configs/px4fmu-v1/nsh/defconfig +++ b/nuttx-configs/px4fmu-v1/nsh/defconfig @@ -423,7 +423,7 @@ CONFIG_BOARD_LOOPSPERMSEC=16717 # Interrupt options # CONFIG_ARCH_HAVE_INTERRUPTSTACK=y -CONFIG_ARCH_INTERRUPTSTACK=4096 +CONFIG_ARCH_INTERRUPTSTACK=2048 CONFIG_ARCH_HAVE_HIPRI_INTERRUPT=y # CONFIG_ARCH_HIPRI_INTERRUPT is not set @@ -563,13 +563,13 @@ CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_HPWORKPERIOD=5000 -CONFIG_SCHED_HPWORKSTACKSIZE=2048 +CONFIG_SCHED_HPWORKSTACKSIZE=1800 CONFIG_SCHED_LPWORK=y CONFIG_SCHED_LPNTHREADS=1 CONFIG_SCHED_LPWORKPRIORITY=50 CONFIG_SCHED_LPWORKPRIOMAX=176 CONFIG_SCHED_LPWORKPERIOD=50000 -CONFIG_SCHED_LPWORKSTACKSIZE=2048 +CONFIG_SCHED_LPWORKSTACKSIZE=1800 # # Stack and heap information |