diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-11-12 10:47:29 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-02-11 07:40:53 +0100 |
commit | 03ff680f31a1964987eb015ef09ae5a1a04508f8 (patch) | |
tree | 277252d03908a9620613356235fcce478b41425e | |
parent | bc97f5c2a0092b2ced1e75f760eec890b2960ea1 (diff) | |
download | px4-firmware-03ff680f31a1964987eb015ef09ae5a1a04508f8.tar.gz px4-firmware-03ff680f31a1964987eb015ef09ae5a1a04508f8.tar.bz2 px4-firmware-03ff680f31a1964987eb015ef09ae5a1a04508f8.zip |
Modernize aerocore config
-rw-r--r-- | nuttx-configs/aerocore/nsh/Make.defs | 1 | ||||
-rw-r--r-- | nuttx-configs/aerocore/nsh/defconfig | 11 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nuttx-configs/aerocore/nsh/Make.defs b/nuttx-configs/aerocore/nsh/Make.defs index 3808fc1cf..10cd651f5 100644 --- a/nuttx-configs/aerocore/nsh/Make.defs +++ b/nuttx-configs/aerocore/nsh/Make.defs @@ -35,6 +35,7 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk +include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs # # We only support building with the ARM bare-metal toolchain from diff --git a/nuttx-configs/aerocore/nsh/defconfig b/nuttx-configs/aerocore/nsh/defconfig index c44b074f3..abcc71423 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,8 +92,8 @@ 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_STACKCHECK=n +CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y +CONFIG_ARMV7M_STACKCHECK=y CONFIG_SERIAL_TERMIOS=y # @@ -293,7 +292,6 @@ 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_I2C_DUTY16_9 is not set # @@ -346,8 +344,9 @@ CONFIG_BOOT_RUNFROMFLASH=y # # Board Selection # -CONFIG_ARCH_BOARD_CUSTOM=y -CONFIG_ARCH_BOARD="" +CONFIG_ARCH_BOARD_AEROCORE=y +# CONFIG_ARCH_BOARD_CUSTOM is not set +CONFIG_ARCH_BOARD="aerocore" # # Common Board Options |