diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-22 08:49:51 +0100 |
|---|---|---|
| committer | David Sidrane <david_s5@nscdg.com> | 2015-04-07 07:18:44 -1000 |
| commit | eecaea08db2ee1ee49dc1667edb2951517239420 (patch) | |
| tree | dbf8e0a0c087cc49b1de3e8e190ee5040b4de4b1 /nuttx-configs | |
| parent | 48c2db967cde33d53152384ce5651c2a67317685 (diff) | |
| download | px4-firmware-eecaea08db2ee1ee49dc1667edb2951517239420.tar.gz px4-firmware-eecaea08db2ee1ee49dc1667edb2951517239420.tar.bz2 px4-firmware-eecaea08db2ee1ee49dc1667edb2951517239420.zip | |
Fix merge fail in nuttx configs, adjust LP and HP work stack sizes, reduce interrupt stack from excessive 4K to 2K
Diffstat (limited to 'nuttx-configs')
| -rw-r--r-- | nuttx-configs/aerocore/nsh/defconfig | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/nuttx-configs/aerocore/nsh/defconfig b/nuttx-configs/aerocore/nsh/defconfig index 998cb1778..95cab99e7 100644 --- a/nuttx-configs/aerocore/nsh/defconfig +++ b/nuttx-configs/aerocore/nsh/defconfig @@ -2,7 +2,6 @@ # Automatically generated file; DO NOT EDIT. # Nuttx/ Configuration # -CONFIG_NUTTX_NEWCONFIG=y # # Build Setup @@ -93,7 +92,7 @@ CONFIG_ARCH_HAVE_MPU=y # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set # CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set -CONFIG_ARMV7M_TOOLCHAIN_GNU_EABI=y +CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y CONFIG_ARMV7M_STACKCHECK=n CONFIG_SERIAL_TERMIOS=y @@ -293,7 +292,7 @@ CONFIG_STM32_USART_SINGLEWIRE=y # CONFIG_STM32_I2C_DYNTIMEO is not set CONFIG_STM32_I2CTIMEOSEC=0 CONFIG_STM32_I2CTIMEOMS=10 -CONFIG_STM32_I2CTIMEOTICKS=500 +CONFIG_STM32_I2CTIMEOTICKS=10 # CONFIG_STM32_I2C_DUTY16_9 is not set # @@ -319,6 +318,7 @@ CONFIG_ARCH_DMA=y # CONFIG_ADDRENV is not set CONFIG_ARCH_HAVE_VFORK=y CONFIG_ARCH_STACKDUMP=y +CONFIG_STACK_COLORATION=y # CONFIG_ENDIAN_BIG is not set # CONFIG_ARCH_HAVE_RAMFUNCS is not set CONFIG_ARCH_HAVE_RAMVECTORS=y @@ -347,8 +347,8 @@ CONFIG_BOOT_RUNFROMFLASH=y # Board Selection # CONFIG_ARCH_BOARD_AEROCORE=y -CONFIG_ARCH_BOARD_CUSTOM=y -CONFIG_ARCH_BOARD="" +# CONFIG_ARCH_BOARD_CUSTOM is not set +CONFIG_ARCH_BOARD="aerocore" # # Common Board Options @@ -358,6 +358,11 @@ CONFIG_NSH_MMCSDMINOR=0 # # Board-Specific Options # +CONFIG_LIB_BOARDCTL=y +# CONFIG_BOARDCTL_TSCTEST is not set +# CONFIG_BOARDCTL_ADCTEST is not set +# CONFIG_BOARDCTL_GRAPHICS is not set +# CONFIG_BOARDCTL_IOCTL is not set # # RTOS Features @@ -467,6 +472,8 @@ CONFIG_MTD_BYTE_WRITE=y # CONFIG_MTD_M25P is not set # CONFIG_MTD_SMART is not set CONFIG_MTD_RAMTRON=y +CONFIG_RAMTRON_WRITEWAIT=y +CONFIG_RAMTRON_SETSPEED=y CONFIG_RAMTRON_FUJITSU=y # CONFIG_MTD_SST25 is not set # CONFIG_MTD_SST39FV is not set |