diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-22 08:49:51 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-22 08:59:14 +0100 |
| commit | aeccede16852460a33cc8e1e7b6bb60f75f8c17a (patch) | |
| tree | da44af50746380e0a46a49ca3d96145b0ffa8a22 | |
| parent | 286fcca6d0795c1524ba7772358623d86994f4ff (diff) | |
| download | px4-firmware-aeccede16852460a33cc8e1e7b6bb60f75f8c17a.tar.gz px4-firmware-aeccede16852460a33cc8e1e7b6bb60f75f8c17a.tar.bz2 px4-firmware-aeccede16852460a33cc8e1e7b6bb60f75f8c17a.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 | 18 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 23 |
3 files changed, 9 insertions, 38 deletions
diff --git a/nuttx-configs/aerocore/nsh/defconfig b/nuttx-configs/aerocore/nsh/defconfig index 5381b85ab..141e1d9a0 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 5cbe0c250..f5adc4c4a 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 @@ -946,18 +946,6 @@ CONFIG_ARCH_MEMCPY=y # # Non-standard Library Support # -<<<<<<< HEAD -======= -CONFIG_SCHED_WORKQUEUE=y -CONFIG_SCHED_HPWORK=y -CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=5000 -CONFIG_SCHED_WORKSTACKSIZE=1800 -CONFIG_SCHED_LPWORK=y -CONFIG_SCHED_LPWORKPRIORITY=50 -CONFIG_SCHED_LPWORKPERIOD=50000 -CONFIG_SCHED_LPWORKSTACKSIZE=1800 ->>>>>>> 38ae6bcc5fd5e9ab1a7304140ec6b36ff027625f # CONFIG_LIB_KBDCODEC is not set # CONFIG_LIB_SLCDCODEC is not set diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index 87b02c77e..d21e179c1 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -444,7 +444,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 @@ -570,24 +570,19 @@ CONFIG_SCHED_WORKQUEUE=y CONFIG_SCHED_HPWORK=y CONFIG_SCHED_HPWORKPRIORITY=192 CONFIG_SCHED_HPWORKPERIOD=5000 -CONFIG_SCHED_HPWORKSTACKSIZE=4000 +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=4000 +CONFIG_SCHED_LPWORKSTACKSIZE=1800 # # Stack and heap information # -<<<<<<< HEAD -CONFIG_IDLETHREAD_STACKSIZE=6000 -CONFIG_USERMAIN_STACKSIZE=4096 -======= CONFIG_IDLETHREAD_STACKSIZE=3500 CONFIG_USERMAIN_STACKSIZE=2600 ->>>>>>> 38ae6bcc5fd5e9ab1a7304140ec6b36ff027625f CONFIG_PTHREAD_STACK_MIN=512 CONFIG_PTHREAD_STACK_DEFAULT=2048 # CONFIG_LIB_SYSCALL is not set @@ -1003,18 +998,6 @@ CONFIG_ARCH_MEMCPY=y # # Non-standard Library Support # -<<<<<<< HEAD -======= -CONFIG_SCHED_WORKQUEUE=y -CONFIG_SCHED_HPWORK=y -CONFIG_SCHED_WORKPRIORITY=192 -CONFIG_SCHED_WORKPERIOD=5000 -CONFIG_SCHED_WORKSTACKSIZE=1800 -CONFIG_SCHED_LPWORK=y -CONFIG_SCHED_LPWORKPRIORITY=50 -CONFIG_SCHED_LPWORKPERIOD=50000 -CONFIG_SCHED_LPWORKSTACKSIZE=1800 ->>>>>>> 38ae6bcc5fd5e9ab1a7304140ec6b36ff027625f # CONFIG_LIB_KBDCODEC is not set # CONFIG_LIB_SLCDCODEC is not set |