From eeb4619f69682ee113fcc6cc99a7dbf141a444c8 Mon Sep 17 00:00:00 2001
From: Lorenz Meier <lm@inf.ethz.ch>
Date: Wed, 12 Nov 2014 10:48:35 +0100
Subject: PX4IOv1: Modernize config

---
 nuttx-configs/px4io-v1/nsh/Make.defs |  1 +
 nuttx-configs/px4io-v1/nsh/defconfig | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'nuttx-configs')

diff --git a/nuttx-configs/px4io-v1/nsh/Make.defs b/nuttx-configs/px4io-v1/nsh/Make.defs
index 74f38c0cb..09a36ea6d 100644
--- a/nuttx-configs/px4io-v1/nsh/Make.defs
+++ b/nuttx-configs/px4io-v1/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/px4io-v1/nsh/defconfig b/nuttx-configs/px4io-v1/nsh/defconfig
index 385b8d6a8..a03166478 100755
--- a/nuttx-configs/px4io-v1/nsh/defconfig
+++ b/nuttx-configs/px4io-v1/nsh/defconfig
@@ -50,8 +50,8 @@
 # CONFIG_ARCH_BOARD_name - for use in C code
 # CONFIG_ENDIAN_BIG - define if big endian (default is little endian)
 # CONFIG_BOARD_LOOPSPERMSEC - for delay loops
-# CONFIG_DRAM_SIZE - Describes the installed DRAM.
-# CONFIG_DRAM_START - The start address of DRAM (physical)
+# CONFIG_RAM_SIZE - Describes the installed DRAM.
+# CONFIG_RAM_START - The start address of DRAM (physical)
 # CONFIG_ARCH_IRQPRIO - The ST32F100CB supports interrupt prioritization
 # CONFIG_ARCH_INTERRUPTSTACK - This architecture supports an interrupt
 #   stack. If defined, this symbol is the size of the interrupt
@@ -80,9 +80,10 @@ CONFIG_ARCH_CHIP_STM32F100C8=y
 CONFIG_ARCH_BOARD_PX4IO_V1=y
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="px4io-v1"
+CONFIG_ARCH_BOARD_PX4IO_V1=y
 CONFIG_BOARD_LOOPSPERMSEC=2000
-CONFIG_DRAM_SIZE=0x00002000
-CONFIG_DRAM_START=0x20000000
+CONFIG_RAM_SIZE=0x00002000
+CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_INTERRUPTSTACK=n
 CONFIG_ARCH_STACKDUMP=y
 CONFIG_ARCH_BOOTLOADER=n
@@ -201,6 +202,11 @@ SERIAL_HAVE_CONSOLE_DMA=y
 CONFIG_USART2_RXDMA=n
 CONFIG_USART3_RXDMA=y
 
+# CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL is not set
+CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y
+# CONFIG_ARMV7M_ITMSYSLOG is not set
+
 #
 # General build options
 #
-- 
cgit v1.2.3