diff --git a/configs/arduino-mega2560/scripts/memx.ld b/configs/arduino-mega2560/scripts/memx.ld
index 67f7ca9169b..6dec47f11b1 100644
--- a/configs/arduino-mega2560/scripts/memx.ld
+++ b/configs/arduino-mega2560/scripts/memx.ld
@@ -129,8 +129,8 @@ SECTIONS
 		*(.vectors)
 		*(.init)
 		*(.handlers)
+		*(.progmem .progmem.*)
 		*(.rodata.str1.*)
-		*(.progmem .progmem.*)                
 		*(.text)
 		*(.text.*)
 		_etext = . ;
diff --git a/configs/arduino-mega2560/scripts/nomemx.ld b/configs/arduino-mega2560/scripts/nomemx.ld
index 87489938390..8f1bee3756d 100644
--- a/configs/arduino-mega2560/scripts/nomemx.ld
+++ b/configs/arduino-mega2560/scripts/nomemx.ld
@@ -129,7 +129,7 @@ SECTIONS
 		*(.vectors)
 		*(.init)
 		*(.handlers)
-		*(.progmem .progmem.*)                
+		*(.progmem .progmem.*)
 		*(.text)
 		*(.text.*)
 		_etext = . ;
diff --git a/configs/teensy-2.0/hello/Make.defs b/configs/teensy-2.0/hello/Make.defs
index f5f10cdba57..e4b286fa2ed 100644
--- a/configs/teensy-2.0/hello/Make.defs
+++ b/configs/teensy-2.0/hello/Make.defs
@@ -37,6 +37,12 @@ include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs
 
+ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y)
+  LDSCRIPT = memx.ld
+else
+  LDSCRIPT = nomemx.ld
+endif
+
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
   DIRLINK = $(TOPDIR)/tools/copydir.sh
@@ -44,13 +50,13 @@ ifeq ($(WINTOOL),y)
   MKDEP = $(TOPDIR)/tools/mknulldeps.sh
   ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/hello/ld.script}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
 else
   # Linux/Cygwin-native toolchain
   MKDEP = $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include"
   ARCHXXINCLUDES =  $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx"
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/hello/ld.script
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
 endif
 
 CC = $(CROSSDEV)gcc
@@ -72,6 +78,12 @@ endif
 
 ARCHCFLAGS = -fno-builtin
 ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+
+ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y)
+  ARCHCFLAGS += -fdata-sections
+  ARCHCXXFLAGS += -fdata-sections
+endif
+
 ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
 ARCHWARNINGSXX = -Wall -Wshadow -Wundef
 ARCHDEFINES =
diff --git a/configs/teensy-2.0/hello/setenv.sh b/configs/teensy-2.0/hello/setenv.sh
index e57fad08d44..6719b21010f 100755
--- a/configs/teensy-2.0/hello/setenv.sh
+++ b/configs/teensy-2.0/hello/setenv.sh
@@ -47,6 +47,11 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
+# This is the Cygwin path to the location where I installed the Atmel
+# Studio AVR toolchain.
+# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Atmel/Studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin"
+# export TOOLCHAIN_BIN="/cygdrive/c/as-7/7.0/toolchain/avr8/avr8-gnu-toolchain/bin"
+
 # This is the Cygwin path to the location where I installed the WinAVR
 # toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
diff --git a/configs/teensy-2.0/nsh/Make.defs b/configs/teensy-2.0/nsh/Make.defs
index 03a23cd836e..ce969cf5abe 100644
--- a/configs/teensy-2.0/nsh/Make.defs
+++ b/configs/teensy-2.0/nsh/Make.defs
@@ -37,6 +37,12 @@ include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs
 
+ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y)
+  LDSCRIPT = memx.ld
+else
+  LDSCRIPT = nomemx.ld
+endif
+
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
   DIRLINK = $(TOPDIR)/tools/copydir.sh
@@ -44,13 +50,13 @@ ifeq ($(WINTOOL),y)
   MKDEP = $(TOPDIR)/tools/mknulldeps.sh
   ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
 else
   # Linux/Cygwin-native toolchain
   MKDEP = $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include"
   ARCHXXINCLUDES =  $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx"
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
 endif
 
 CC = $(CROSSDEV)gcc
@@ -72,6 +78,12 @@ endif
 
 ARCHCFLAGS = -fno-builtin
 ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+
+ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y)
+  ARCHCFLAGS += -fdata-sections
+  ARCHCXXFLAGS += -fdata-sections
+endif
+
 ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
 ARCHWARNINGSXX = -Wall -Wshadow -Wundef
 ARCHDEFINES =
diff --git a/configs/teensy-2.0/nsh/defconfig b/configs/teensy-2.0/nsh/defconfig
index ddf0fc8becf..1daa2528c3e 100644
--- a/configs/teensy-2.0/nsh/defconfig
+++ b/configs/teensy-2.0/nsh/defconfig
@@ -21,6 +21,7 @@ CONFIG_WINDOWS_CYGWIN=y
 # Build Configuration
 #
 # CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -30,10 +31,12 @@ CONFIG_WINDOWS_CYGWIN=y
 CONFIG_INTELHEX_BINARY=y
 # CONFIG_MOTOROLA_SREC is not set
 # CONFIG_RAW_BINARY is not set
+# CONFIG_UBOOT_UIMAGE is not set
 
 #
 # Customize Header Files
 #
+# CONFIG_ARCH_STDINT_H is not set
 # CONFIG_ARCH_STDBOOL_H is not set
 # CONFIG_ARCH_MATH_H is not set
 # CONFIG_ARCH_FLOAT_H is not set
@@ -43,8 +46,9 @@ CONFIG_INTELHEX_BINARY=y
 # Debug Options
 #
 # CONFIG_DEBUG is not set
-CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -67,24 +71,26 @@ CONFIG_ARCH_AVR=y
 CONFIG_ARCH="avr"
 CONFIG_ARCH_FAMILY="avr"
 CONFIG_ARCH_CHIP="at90usb"
-# CONFIG_ARCH_CHIP_ATMEGA128 is not set
-# CONFIG_ARCH_CHIP_AT90USB646 is not set
-# CONFIG_ARCH_CHIP_AT90USB647 is not set
-CONFIG_ARCH_CHIP_AT90USB1286=y
-# CONFIG_ARCH_CHIP_AT90USB1287 is not set
-# CONFIG_ARCH_CHIP_AT32UC3B0256 is not set
-CONFIG_ARCH_FAMILY_AVR=y
+# CONFIG_ARCH_CHIP_ATMEGA is not set
 CONFIG_ARCH_CHIP_AT90USB=y
+# CONFIG_ARCH_CHIP_AT32UC3 is not set
+CONFIG_ARCH_FAMILY_AVR=y
+# CONFIG_ARCH_FAMILY_AVR32 is not set
 
 #
 # AVR Configuration Options
 #
 # CONFIG_AVR_WINAVR is not set
+# CONFIG_AVR_ATMEL_AVR_TOOLCHAIN is not set
 CONFIG_AVR_BUILDROOT=y
 
 #
 # AT90USB Configuration Options
 #
+# CONFIG_ARCH_CHIP_AT90USB646 is not set
+# CONFIG_ARCH_CHIP_AT90USB647 is not set
+CONFIG_ARCH_CHIP_AT90USB1286=y
+# CONFIG_ARCH_CHIP_AT90USB1287 is not set
 
 #
 # AT90USB Peripheral Selections
@@ -94,7 +100,6 @@ CONFIG_AVR_USART1=y
 # CONFIG_AVR_USBDEV is not set
 # CONFIG_AVR_WDT is not set
 # CONFIG_AVR_GPIOIRQ is not set
-# CONFIG_AVR_USART0 is not set
 
 #
 # Architecture Options
@@ -103,10 +108,17 @@ CONFIG_ARCH_NOINTC=y
 # CONFIG_ARCH_VECNOTIRQ is not set
 # CONFIG_ARCH_DMA is not set
 # CONFIG_ARCH_HAVE_IRQPRIO is not set
-# CONFIG_ARCH_ADDRENV is not set
+# CONFIG_ARCH_L2CACHE is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
 # CONFIG_ARCH_HAVE_VFORK is not set
 # CONFIG_ARCH_HAVE_MMU is not set
+# CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
+# CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
+# CONFIG_ARCH_HAVE_RESET is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_IDLE_CUSTOM is not set
@@ -160,33 +172,11 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # Board-Specific Options
 #
+# CONFIG_LIB_BOARDCTL is not set
 
 #
 # RTOS Features
 #
-# CONFIG_BOARD_INITIALIZE is not set
-CONFIG_USEC_PER_TICK=10000
-# CONFIG_SYSTEM_TIME64 is not set
-CONFIG_RR_INTERVAL=200
-# CONFIG_SCHED_CPULOAD is not set
-# CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=0
-# CONFIG_SCHED_HAVE_PARENT is not set
-# CONFIG_JULIAN_TIME is not set
-CONFIG_START_YEAR=2010
-CONFIG_START_MONTH=6
-CONFIG_START_DAY=17
-CONFIG_DEV_CONSOLE=y
-# CONFIG_MUTEX_TYPES is not set
-# CONFIG_PRIORITY_INHERITANCE is not set
-# CONFIG_FDCLONE_DISABLE is not set
-# CONFIG_FDCLONE_STDIO is not set
-CONFIG_SDCLONE_DISABLE=y
-# CONFIG_SCHED_WAITPID is not set
-# CONFIG_SCHED_STARTHOOK is not set
-# CONFIG_SCHED_ATEXIT is not set
-# CONFIG_SCHED_ONEXIT is not set
-CONFIG_USER_ENTRYPOINT="nsh_main"
 CONFIG_DISABLE_OS_API=y
 CONFIG_DISABLE_POSIX_TIMERS=y
 CONFIG_DISABLE_PTHREAD=y
@@ -194,27 +184,75 @@ CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_MQUEUE=y
 # CONFIG_DISABLE_ENVIRON is not set
 
+#
+# Clocks and Timers
+#
+CONFIG_USEC_PER_TICK=10000
+# CONFIG_SYSTEM_TIME64 is not set
+# CONFIG_CLOCK_MONOTONIC is not set
+# CONFIG_JULIAN_TIME is not set
+CONFIG_START_YEAR=2010
+CONFIG_START_MONTH=6
+CONFIG_START_DAY=17
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=4
+CONFIG_WDOG_INTRESERVE=0
+CONFIG_PREALLOC_TIMERS=0
+
+#
+# Tasks and Scheduling
+#
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_SPORADIC is not set
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_MAX_TASKS=8
+# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_SCHED_WAITPID is not set
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
+# CONFIG_FDCLONE_DISABLE is not set
+# CONFIG_FDCLONE_STDIO is not set
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_NFILE_DESCRIPTORS=6
+CONFIG_NFILE_STREAMS=6
+CONFIG_NAME_MAX=32
+# CONFIG_PRIORITY_INHERITANCE is not set
+
+#
+# RTOS hooks
+#
+# CONFIG_BOARD_INITIALIZE is not set
+# CONFIG_SCHED_STARTHOOK is not set
+# CONFIG_SCHED_ATEXIT is not set
+# CONFIG_SCHED_ONEXIT is not set
+
 #
 # Signal Numbers
 #
 CONFIG_SIG_SIGUSR1=1
 CONFIG_SIG_SIGUSR2=2
 CONFIG_SIG_SIGALARM=3
+# CONFIG_MODULE is not set
 
 #
-# Sizes of configurable things (0 disables)
+# Work queue support
 #
-CONFIG_MAX_TASKS=8
-CONFIG_NPTHREAD_KEYS=0
-CONFIG_NFILE_DESCRIPTORS=6
-CONFIG_NFILE_STREAMS=6
-CONFIG_NAME_MAX=32
-CONFIG_PREALLOC_MQ_MSGS=0
-CONFIG_MQ_MAXMSGSIZE=0
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_WDOG_INTRESERVE=0
-CONFIG_PREALLOC_TIMERS=0
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
 
 #
 # Stack and heap information
@@ -223,6 +261,7 @@ CONFIG_IDLETHREAD_STACKSIZE=512
 CONFIG_USERMAIN_STACKSIZE=512
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=512
+# CONFIG_LIB_SYSCALL is not set
 
 #
 # Device Drivers
@@ -231,14 +270,26 @@ CONFIG_DISABLE_POLL=y
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_DEV_LOOP is not set
+
+#
+# Buffering
+#
+# CONFIG_DRVR_WRITEBUFFER is not set
+# CONFIG_DRVR_READAHEAD is not set
 # CONFIG_RAMDISK is not set
 # CONFIG_CAN is not set
 # CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_ARCH_HAVE_PWM_MULTICHAN is not set
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_ANALOG is not set
@@ -246,9 +297,17 @@ CONFIG_DEV_NULL=y
 # CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 # CONFIG_INPUT is not set
+# CONFIG_IOEXPANDER is not set
 # CONFIG_LCD is not set
+
+#
+# LED Support
+#
+# CONFIG_USERLED is not set
+# CONFIG_PCA9635PW is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MTD is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -257,7 +316,28 @@ CONFIG_DEV_NULL=y
 CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 # CONFIG_16550_UART is not set
+# CONFIG_ARCH_HAVE_UART is not set
+# CONFIG_ARCH_HAVE_UART0 is not set
+# CONFIG_ARCH_HAVE_UART1 is not set
+# CONFIG_ARCH_HAVE_UART2 is not set
+# CONFIG_ARCH_HAVE_UART3 is not set
+# CONFIG_ARCH_HAVE_UART4 is not set
+# CONFIG_ARCH_HAVE_UART5 is not set
+# CONFIG_ARCH_HAVE_UART6 is not set
+# CONFIG_ARCH_HAVE_UART7 is not set
+# CONFIG_ARCH_HAVE_UART8 is not set
+# CONFIG_ARCH_HAVE_SCI0 is not set
+# CONFIG_ARCH_HAVE_SCI1 is not set
+# CONFIG_ARCH_HAVE_USART0 is not set
 CONFIG_ARCH_HAVE_USART1=y
+# CONFIG_ARCH_HAVE_USART2 is not set
+# CONFIG_ARCH_HAVE_USART3 is not set
+# CONFIG_ARCH_HAVE_USART4 is not set
+# CONFIG_ARCH_HAVE_USART5 is not set
+# CONFIG_ARCH_HAVE_USART6 is not set
+# CONFIG_ARCH_HAVE_USART7 is not set
+# CONFIG_ARCH_HAVE_USART8 is not set
+# CONFIG_ARCH_HAVE_OTHER_UART is not set
 
 #
 # USART Configuration
@@ -265,7 +345,12 @@ CONFIG_ARCH_HAVE_USART1=y
 CONFIG_USART1_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_SERIAL_DMA is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_USART1_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -279,8 +364,7 @@ CONFIG_USART1_PARITY=0
 CONFIG_USART1_2STOP=0
 # CONFIG_USART1_IFLOWCONTROL is not set
 # CONFIG_USART1_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_USART1_DMA is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_WIRELESS is not set
@@ -293,6 +377,7 @@ CONFIG_USART1_2STOP=0
 # System Logging
 #
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_CONSOLE is not set
 
 #
 # Networking Support
@@ -301,6 +386,11 @@ CONFIG_USART1_2STOP=0
 # CONFIG_ARCH_HAVE_PHY is not set
 # CONFIG_NET is not set
 
+#
+# Crypto API
+#
+# CONFIG_CRYPTO is not set
+
 #
 # File Systems
 #
@@ -312,14 +402,16 @@ CONFIG_DISABLE_MOUNTPOINT=y
 CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 # CONFIG_FS_READABLE is not set
 # CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_NAMED_SEMAPHORES is not set
 # CONFIG_FS_RAMMAP is not set
 # CONFIG_FS_PROCFS is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # System Logging
 #
-
 # CONFIG_SYSLOG is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
 
 #
 # Graphics Support
@@ -329,7 +421,7 @@ CONFIG_DISABLE_PSEUDOFS_OPERATIONS=y
 #
 # Memory Management
 #
-# CONFIG_MM_SMALL is not set
+CONFIG_MM_SMALL=y
 CONFIG_MM_REGIONS=1
 # CONFIG_ARCH_HAVE_HEAP2 is not set
 # CONFIG_GRAN is not set
@@ -340,7 +432,7 @@ CONFIG_MM_REGIONS=1
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_BINFMT_EXEPATH is not set
@@ -365,6 +457,7 @@ CONFIG_LIB_HOMEDIR="/"
 CONFIG_NOPRINTF_FIELDWIDTH=y
 # CONFIG_LIBC_FLOATINGPOINT is not set
 # CONFIG_LIBC_LONG_LONG is not set
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -376,14 +469,16 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+# CONFIG_LIBC_NETDB is not set
 
 #
 # Non-standard Library Support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -398,26 +493,24 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 
 #
-# Built-In Applications
+# CAN Utilities
 #
 
 #
 # Examples
 #
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
 # CONFIG_EXAMPLES_FTPD is not set
 # CONFIG_EXAMPLES_HELLO is not set
-# CONFIG_EXAMPLES_HELLOXX is not set
 # CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
 # CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
-# CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_MEDIA is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 # CONFIG_EXAMPLES_MOUNT is not set
@@ -427,86 +520,94 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
-# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PCA9635 is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
 # CONFIG_EXAMPLES_QENCODER is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
+#
+# File System Utilities
+#
+
 #
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
 # CONFIG_INTERPRETERS_FICL is not set
 # CONFIG_INTERPRETERS_PCODE is not set
-
-#
-# Network Utilities
-#
-
-#
-# Networking Utilities
-#
-# CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
-# CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
-# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 
 #
 # FreeModBus
 #
 # CONFIG_MODBUS is not set
 
+#
+# Network Utilities
+#
+# CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_FTPC is not set
+# CONFIG_NETUTILS_JSON is not set
+# CONFIG_NETUTILS_SMTP is not set
+
 #
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
+
+#
+# Command Line Configuration
+#
 CONFIG_NSH_READLINE=y
 # CONFIG_NSH_CLE is not set
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_DISABLE_SEMICOLON=y
+CONFIG_NSH_MAXARGUMENTS=6
+# CONFIG_NSH_ARGCAT is not set
+CONFIG_NSH_NESTDEPTH=3
+# CONFIG_NSH_DISABLEBG is not set
 
 #
 # Disable Individual commands
 #
 CONFIG_NSH_DISABLE_ADDROUTE=y
+CONFIG_NSH_DISABLE_BASENAME=y
 # CONFIG_NSH_DISABLE_CAT is not set
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
 CONFIG_NSH_DISABLE_CMP=y
+CONFIG_NSH_DISABLE_DATE=y
 CONFIG_NSH_DISABLE_DD=y
 CONFIG_NSH_DISABLE_DF=y
 CONFIG_NSH_DISABLE_DELROUTE=y
+CONFIG_NSH_DISABLE_DIRNAME=y
 # CONFIG_NSH_DISABLE_ECHO is not set
 CONFIG_NSH_DISABLE_EXEC=y
 CONFIG_NSH_DISABLE_EXIT=y
@@ -515,8 +616,10 @@ CONFIG_NSH_DISABLE_GET=y
 # CONFIG_NSH_DISABLE_HELP is not set
 CONFIG_NSH_DISABLE_HEXDUMP=y
 # CONFIG_NSH_DISABLE_IFCONFIG is not set
+CONFIG_NSH_DISABLE_IFUPDOWN=y
 # CONFIG_NSH_DISABLE_KILL is not set
 CONFIG_NSH_DISABLE_LOSETUP=y
+CONFIG_NSH_DISABLE_LOSMART=y
 # CONFIG_NSH_DISABLE_LS is not set
 # CONFIG_NSH_DISABLE_MB is not set
 # CONFIG_NSH_DISABLE_MKDIR is not set
@@ -524,6 +627,7 @@ CONFIG_NSH_DISABLE_MKFIFO=y
 CONFIG_NSH_DISABLE_MKRD=y
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
 CONFIG_NSH_DISABLE_PUT=y
@@ -533,8 +637,10 @@ CONFIG_NSH_DISABLE_PUT=y
 # CONFIG_NSH_DISABLE_SET is not set
 # CONFIG_NSH_DISABLE_SH is not set
 # CONFIG_NSH_DISABLE_SLEEP is not set
+CONFIG_NSH_DISABLE_TIME=y
 # CONFIG_NSH_DISABLE_TEST is not set
 # CONFIG_NSH_DISABLE_UMOUNT is not set
+CONFIG_NSH_DISABLE_UNAME=y
 # CONFIG_NSH_DISABLE_UNSET is not set
 # CONFIG_NSH_DISABLE_USLEEP is not set
 CONFIG_NSH_DISABLE_WGET=y
@@ -545,18 +651,16 @@ CONFIG_NSH_DISABLE_XD=y
 #
 CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_FILEIOSIZE=512
-CONFIG_NSH_LINELEN=64
-CONFIG_NSH_DISABLE_SEMICOLON=y
-CONFIG_NSH_MAXARGUMENTS=6
-# CONFIG_NSH_ARGCAT is not set
-CONFIG_NSH_NESTDEPTH=3
-CONFIG_NSH_DISABLESCRIPT=y
-# CONFIG_NSH_DISABLEBG is not set
-CONFIG_NSH_CONSOLE=y
 
 #
-# USB Trace Support
+# Scripting Support
 #
+CONFIG_NSH_DISABLESCRIPT=y
+
+#
+# Console Configuration
+#
+CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 # CONFIG_NSH_ARCHINIT is not set
 
@@ -572,96 +676,21 @@ CONFIG_NSH_CONSOLE=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# Custom Free Memory Command
-#
 # CONFIG_SYSTEM_FREE is not set
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_SYSTEM_INIFILE is not set
-
-#
-# FLASH Program Installation
-#
+# CONFIG_SYSTEM_CLE is not set
+# CONFIG_SYSTEM_CUTERM is not set
 # CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
+# CONFIG_SYSTEM_HEX2BIN is not set
+# CONFIG_SYSTEM_INIFILE is not set
+# CONFIG_SYSTEM_HEXED is not set
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
+CONFIG_READLINE_HAVE_EXTMATCH=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
+# CONFIG_READLINE_TABCOMPLETION is not set
+# CONFIG_READLINE_CMD_HISTORY is not set
 # CONFIG_SYSTEM_RAMTRON is not set
-
-#
-# SD Card
-#
 # CONFIG_SYSTEM_SDCARD is not set
-
-#
-# Sysinfo
-#
-
-#
-# USB Monitor
-#
-
-#
-# EMACS-like Command Line Editor
-#
-# CONFIG_SYSTEM_CLE is not set
-
-#
-# VI Work-Alike Editor
-#
+# CONFIG_SYSTEM_SUDOKU is not set
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/configs/teensy-2.0/nsh/setenv.sh b/configs/teensy-2.0/nsh/setenv.sh
index e5ed23b0e82..b14f17bbd10 100755
--- a/configs/teensy-2.0/nsh/setenv.sh
+++ b/configs/teensy-2.0/nsh/setenv.sh
@@ -47,6 +47,11 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
+# This is the Cygwin path to the location where I installed the Atmel
+# Studio AVR toolchain.
+# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Atmel/Studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin"
+# export TOOLCHAIN_BIN="/cygdrive/c/as-7/7.0/toolchain/avr8/avr8-gnu-toolchain/bin"
+
 # This is the Cygwin path to the location where I installed the WinAVR
 # toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have
diff --git a/configs/teensy-2.0/nsh/ld.script b/configs/teensy-2.0/scripts/memx.ld
old mode 100755
new mode 100644
similarity index 86%
rename from configs/teensy-2.0/nsh/ld.script
rename to configs/teensy-2.0/scripts/memx.ld
index 6c8aec1e1a9..60262b3743c
--- a/configs/teensy-2.0/nsh/ld.script
+++ b/configs/teensy-2.0/scripts/memx.ld
@@ -1,7 +1,7 @@
-/**************************************************************************************
- * configs/teensy-2.0/nsh/ld.script
+/************************************************************************************
+ * configs/teensy-2.0/scripts/memx.ld
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,15 +31,15 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- **************************************************************************************/
+ ************************************************************************************/
 
-/* Memory Regions *********************************************************************/
-/* -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
- *                FLASH        | REGISTERS I/O       EXT I/O    ISRAM      | EEPROM
- *                             |           REGISTERS REGISTERS             |
- * -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
- * AT90USB1286    0x0000 128Kb | 0x0000 32 0x0020 64 0x0060 160 0x0100 8Kb | 0x0000 4Kb
- * -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+/* Memory Regions *******************************************************************/
+/* ------------ ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+ *              FLASH        | REGISTERS I/O       EXT I/O    ISRAM      | EEPROM
+ *                           |           REGISTERS REGISTERS             |
+ * ------------ ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
+ * AT90USB1286  0x0000 128Kb | 0x0000 32 0x0020 64 0x0060 160 0x0100 8Kb | 0x0000 4Kb
+ * ------------ ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
  */
 
 MEMORY
@@ -128,6 +128,8 @@ SECTIONS
 		*(.vectors)
 		*(.init)
 		*(.handlers)
+		*(.progmem .progmem.*)
+		*(.rodata.str1.*)
 		*(.text)
 		*(.text.*)
 		_etext = . ;
@@ -138,6 +140,7 @@ SECTIONS
 	.data			:
 	{
 		_sdata = ABSOLUTE(.);
+		*(.rodata .rodata.*)                
 		*(.data .data.*)
 		*(.gnu.linkonce.d.*)
 		CONSTRUCTORS
diff --git a/configs/teensy-2.0/hello/ld.script b/configs/teensy-2.0/scripts/nomemx.ld
similarity index 98%
rename from configs/teensy-2.0/hello/ld.script
rename to configs/teensy-2.0/scripts/nomemx.ld
index cc55e8fae82..6b4709d4a6a 100644
--- a/configs/teensy-2.0/hello/ld.script
+++ b/configs/teensy-2.0/scripts/nomemx.ld
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/teensy-2.0/hello/ld.script
+ * configs/teensy-2.0/scripts/nomemx.ld
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -128,6 +128,7 @@ SECTIONS
 		*(.vectors)
 		*(.init)
 		*(.handlers)
+		*(.progmem .progmem.*)
 		*(.text)
 		*(.text.*)
 		_etext = . ;
@@ -138,6 +139,7 @@ SECTIONS
 	.data			:
 	{
 		_sdata = ABSOLUTE(.);
+		*(.rodata .rodata.*)                
 		*(.data .data.*)
 		*(.gnu.linkonce.d.*)
 		CONSTRUCTORS
diff --git a/configs/teensy-2.0/usbmsc/Make.defs b/configs/teensy-2.0/usbmsc/Make.defs
index 84ed1bb223a..45362d230fb 100644
--- a/configs/teensy-2.0/usbmsc/Make.defs
+++ b/configs/teensy-2.0/usbmsc/Make.defs
@@ -37,6 +37,12 @@ include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs
 
+ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y)
+  LDSCRIPT = memx.ld
+else
+  LDSCRIPT = nomemx.ld
+endif
+
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
   DIRLINK = $(TOPDIR)/tools/copydir.sh
@@ -44,13 +50,13 @@ ifeq ($(WINTOOL),y)
   MKDEP = $(TOPDIR)/tools/mknulldeps.sh
   ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES = $(ARCHINCLUDES) "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/usbmsc/ld.script}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)}"
 else
   # Linux/Cygwin-native toolchain
   MKDEP = $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES = -I. -isystem "$(TOPDIR)/include"
   ARCHXXINCLUDES =  $(ARCHINCLUDES) -isystem "$(TOPDIR)/include/cxx"
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/usbmsc/ld.script
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/$(LDSCRIPT)
 endif
 
 CC = $(CROSSDEV)gcc
@@ -72,6 +78,12 @@ endif
 
 ARCHCFLAGS = -fno-builtin
 ARCHCXXFLAGS = -fno-builtin -fno-exceptions
+
+ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y)
+  ARCHCFLAGS += -fdata-sections
+  ARCHCXXFLAGS += -fdata-sections
+endif
+
 ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
 ARCHWARNINGSXX = -Wall -Wshadow -Wundef
 ARCHDEFINES =
diff --git a/configs/teensy-2.0/usbmsc/ld.script b/configs/teensy-2.0/usbmsc/ld.script
deleted file mode 100755
index 95f6bd460da..00000000000
--- a/configs/teensy-2.0/usbmsc/ld.script
+++ /dev/null
@@ -1,210 +0,0 @@
-/**************************************************************************************
- * configs/teensy-2.0/usbmsc/ld.script
- *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *	notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *	notice, this list of conditions and the following disclaimer in
- *	the documentation and/or other materials provided with the
- *	distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *	used to endorse or promote products derived from this software
- *	without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- **************************************************************************************/
-
-/* Memory Regions *********************************************************************/
-/* -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
- *                FLASH        | REGISTERS I/O       EXT I/O    ISRAM      | EEPROM
- *                             |           REGISTERS REGISTERS             |
- * -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
- * AT90USB1286    0x0000 128Kb | 0x0000 32 0x0020 64 0x0060 160 0x0100 8Kb | 0x0000 4Kb
- * -------------- ------ ------+------- -- ------ -- ------ --- ------ ----+------- ---
- */
-
-MEMORY
-{
-	flash    (rx) : ORIGIN = 0, LENGTH = 128K
-	sram   (rw!x) : ORIGIN = 0x800100, LENGTH = 8K
-	eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 4K
-}
-
-OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr")
-OUTPUT_ARCH(avr:5)
-ENTRY(__start)
-
-SECTIONS
-{
-	/* Read-only sections, merged into text segment: */
-
-	.hash			: { *(.hash) }
-	.dynsym			: { *(.dynsym) }
-	.dynstr			: { *(.dynstr) }
-	.gnu.version	: { *(.gnu.version) }
-	.gnu.version_d	: { *(.gnu.version_d) }
-	.gnu.version_r	: { *(.gnu.version_r) }
-	.rel.init		: { *(.rel.init) }
-	.rela.init		: { *(.rela.init) }
-
-	.rel.text		:
-		{
-			*(.rel.text)
-			*(.rel.text.*)
-			*(.rel.gnu.linkonce.t*)
-		}
-
-	.rela.text		:
-		{
-			*(.rela.text)
-			*(.rela.text.*)
-			*(.rela.gnu.linkonce.t*)
-		}
-
-	.rel.fini		: { *(.rel.fini) }
-	.rela.fini		: { *(.rela.fini) }
-
-	.rel.rodata		:
-		{
-			*(.rel.rodata)
-			*(.rel.rodata.*)
-			*(.rel.gnu.linkonce.r*)
-		}
-
-	.rela.rodata	:
-		{
-			*(.rela.rodata)
-			*(.rela.rodata.*)
-			*(.rela.gnu.linkonce.r*)
-		}
-
-	.rel.data		:
-		{
-			*(.rel.data)
-			*(.rel.data.*)
-			*(.rel.gnu.linkonce.d*)
-		}
-
-	.rela.data		:
-		{
-			*(.rela.data)
-			*(.rela.data.*)
-			*(.rela.gnu.linkonce.d*)
-		}
-
-	.rel.ctors		: { *(.rel.ctors) }
-	.rela.ctors		: { *(.rela.ctors) }
-	.rel.dtors		: { *(.rel.dtors) }
-	.rela.dtors		: { *(.rela.dtors) }
-	.rel.got		: { *(.rel.got) }
-	.rela.got		: { *(.rela.got) }
-	.rel.bss		: { *(.rel.bss) }
-	.rela.bss		: { *(.rela.bss) }
-	.rel.plt		: { *(.rel.plt) }
-	.rela.plt		: { *(.rela.plt) }
-
-	.text			:
-	{
-		_stext = . ;
-		*(.vectors)
-		*(.init)
-		*(.handlers)
-		*(.text)
-		*(.text.*)
-		_etext = . ;
-	} > flash
-
-	_eronly = ABSOLUTE(.);
-
-	.data			:
-	{
-		_sdata = ABSOLUTE(.);
-		*(.data .data.*)
-		*(.gnu.linkonce.d.*)
-		CONSTRUCTORS
-		_edata = ABSOLUTE(.);
-	} > sram AT > flash
-
-	.bss			:
-	{
-		_sbss = ABSOLUTE(.);
-		*(.bss .bss.*)
-		*(.gnu.linkonce.b.*)
-		*(COMMON)
-		_ebss = ABSOLUTE(.);
-	} > sram
-
-	/* Global data not cleared after reset.	*/
-
-	.noinit			:
-	{
-		_snoinit = ABSOLUTE(.);
-		*(.noinit*)
-		_enoinit = ABSOLUTE(.);
-	}	> sram
-
-	.eeprom			:
-	{
-		_seeprom = ABSOLUTE(.);
-		*(.eeprom*)
-		_eeeprom = ABSOLUTE(.);
-	}	> eeprom
-
-	/* Stabs debugging sections.	*/
-
-	.stab 0				: { *(.stab) }
-	.stabstr 0			: { *(.stabstr) }
-	.stab.excl 0		: { *(.stab.excl) }
-	.stab.exclstr 0		: { *(.stab.exclstr) }
-	.stab.index 0		: { *(.stab.index) }
-	.stab.indexstr 0	: { *(.stab.indexstr) }
-	.comment 0			: { *(.comment) }
-
-	/* DWARF debug sections.
-		 Symbols in the DWARF debugging sections are relative to the beginning
-		 of the section so we begin them at 0.	*/
-
-	/* DWARF 1 */
-
-	.debug 0			: { *(.debug) }
-	.line 0				: { *(.line) }
-
-	/* GNU DWARF 1 extensions */
-
-	.debug_srcinfo 0	: { *(.debug_srcinfo) }
-	.debug_sfnames 0	: { *(.debug_sfnames) }
-
-	/* DWARF 1.1 and DWARF 2 */
-
-	.debug_aranges 0 	: { *(.debug_aranges) }
-	.debug_pubnames 0	: { *(.debug_pubnames) }
-
-	/* DWARF 2 */
-
-	.debug_info 0		: { *(.debug_info) *(.gnu.linkonce.wi.*) }
-	.debug_abbrev 0		: { *(.debug_abbrev) }
-	.debug_line 0		: { *(.debug_line) }
-	.debug_frame 0		: { *(.debug_frame) }
-	.debug_str 0		: { *(.debug_str) }
-	.debug_loc 0		: { *(.debug_loc) }
-	.debug_macinfo 0	: { *(.debug_macinfo) }
-}
diff --git a/configs/teensy-2.0/usbmsc/setenv.sh b/configs/teensy-2.0/usbmsc/setenv.sh
index f4e2f1febdf..a19eb9c1ee5 100755
--- a/configs/teensy-2.0/usbmsc/setenv.sh
+++ b/configs/teensy-2.0/usbmsc/setenv.sh
@@ -47,6 +47,11 @@ if [ -z "${PATH_ORIG}" ]; then
   export PATH_ORIG="${PATH}"
 fi
 
+# This is the Cygwin path to the location where I installed the Atmel
+# Studio AVR toolchain.
+# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Atmel/Studio/7.0/toolchain/avr8/avr8-gnu-toolchain/bin"
+# export TOOLCHAIN_BIN="/cygdrive/c/as-7/7.0/toolchain/avr8/avr8-gnu-toolchain/bin"
+
 # This is the Cygwin path to the location where I installed the WinAVR
 # toolchain under windows.  This is *not* the default install
 # location so you will probably have to edit this.  You will also have