Add common Toolchain.defs for AVR/AVR32; Add Toolchain.defs for ARM; Add more toolchain options (from Mike); incdir.sh and .bat now take -s option

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5384 42af7a65-404d-4744-a932-0658087f49c3

4 files changed, 18 insertions, 82 deletions

diff --git a/nuttx/configs/teensy/README.txt b/nuttx/configs/teensy/README.txt
index 30349e1ff..951f4a87e 100644
--- a/nuttx/configs/teensy/README.txt
+++ b/nuttx/configs/teensy/README.txt
@@ -201,7 +201,13 @@ Toolchains
 
 There are several toolchain options.  However, testing has been performed
 using *only* the NuttX buildroot toolchain described below.  Therefore,
-the NuttX buildroot toolchain is the recommended choice:
+the NuttX buildroot toolchain is the recommended choice.
+
+The toolchain may be selected using the mconf tool (via 'make menuconfig'),
+by editing the existing configuration file (defconfig), or by overriding
+the toolchain on the make commandline with CONFIG_AVR_TOOLCHAIN=<toolchain>.
+
+The valid values for <toolchain> are BUILDROOT, CROSSPACK, LINUXGCC and WINAVR.
 
 Buildroot:
 
@@ -239,6 +245,14 @@ Linux:
   After configuring NuttX, make sure that CONFIG_AVR_LINUXGCC=y is set in your
   .config file.
 
+Mac OS X:
+
+  For Mac OS X, the CrossPack for AVR toolchain is available from:
+
+    http://www.obdev.at/products/crosspack/index.html
+
+  This toolchain is functionally equivalent to the Linux GCC toolchain.
+
 Windows Native Toolchains
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/nuttx/configs/teensy/hello/Make.defs b/nuttx/configs/teensy/hello/Make.defs
index 9c7cb8268..d09279a8d 100644
--- a/nuttx/configs/teensy/hello/Make.defs
+++ b/nuttx/configs/teensy/hello/Make.defs
@@ -35,33 +35,7 @@
 
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
-
-# Setup for the selected toolchain
-
-ifeq ($(CONFIG_AVR_WINAVR),y)
-  # WinAVR toolchain under Windows/Cygwin
-  CROSSDEV = avr-
-  WINTOOL = y
-  MAXOPTIMIZATION = -O2
-  ARCHCPUFLAGS = -mmcu=at90usb1286
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
-
-ifeq ($(CONFIG_AVR_LINUXGCC),y)
-  # GCC toolchain under Linux
-  CROSSDEV = avr-
-  MAXOPTIMIZATION = -O2
-  ARCHCPUFLAGS = -mmcu=at90usb1286
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
-
-ifeq ($(CONFIG_AVR_BUILDROOT),y)
-  # NuttX buildroot GCC toolchain under Linux or Cygwin
-  CROSSDEV = avr-nuttx-elf-
-  MAXOPTIMIZATION = -O2
-  ARCHCPUFLAGS = -mmcu=at90usb1286
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
+include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs
 
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
diff --git a/nuttx/configs/teensy/nsh/Make.defs b/nuttx/configs/teensy/nsh/Make.defs
index 63c9db51f..e65958cfe 100644
--- a/nuttx/configs/teensy/nsh/Make.defs
+++ b/nuttx/configs/teensy/nsh/Make.defs
@@ -35,33 +35,7 @@
 
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
-
-# Setup for the selected toolchain
-
-ifeq ($(CONFIG_AVR_WINAVR),y)
-  # WinAVR toolchain under Windows/Cygwin
-  CROSSDEV = avr-
-  WINTOOL = y
-  MAXOPTIMIZATION = -O2
-  ARCHCPUFLAGS = -mmcu=at90usb1286
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
-
-ifeq ($(CONFIG_AVR_LINUXGCC),y)
-  # GCC toolchain under Linux
-  CROSSDEV = avr-
-  MAXOPTIMIZATION = -O2
-  ARCHCPUFLAGS = -mmcu=at90usb1286
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
-
-ifeq ($(CONFIG_AVR_BUILDROOT),y)
-  # NuttX buildroot GCC toolchain under Linux or Cygwin
-  CROSSDEV = avr-nuttx-elf-
-  MAXOPTIMIZATION = -O2
-  ARCHCPUFLAGS = -mmcu=at90usb1286
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
+include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs
 
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
diff --git a/nuttx/configs/teensy/usbstorage/Make.defs b/nuttx/configs/teensy/usbstorage/Make.defs
index 6474a772e..ba3878521 100644
--- a/nuttx/configs/teensy/usbstorage/Make.defs
+++ b/nuttx/configs/teensy/usbstorage/Make.defs
@@ -35,33 +35,7 @@
 
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
-
-# Setup for the selected toolchain
-
-ifeq ($(CONFIG_AVR_WINAVR),y)
-  # WinAVR toolchain under Windows/Cygwin
-  CROSSDEV = avr-
-  WINTOOL = y
-  MAXOPTIMIZATION = -O2
-  ARCHCPUFLAGS = -mmcu=at90usb1286
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
-
-ifeq ($(CONFIG_AVR_LINUXGCC),y)
-  # GCC toolchain under Linux
-  CROSSDEV = avr-
-  MAXOPTIMIZATION = -O2
-  ARCHCPUFLAGS = -mmcu=at90usb1286
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
-
-ifeq ($(CONFIG_AVR_BUILDROOT),y)
-  # NuttX buildroot GCC toolchain under Linux or Cygwin
-  CROSSDEV = avr-nuttx-elf-
-  MAXOPTIMIZATION = -O2
-  ARCHCPUFLAGS = -mmcu=at90usb1286
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
+include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs
 
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains