configs/mcu123-lpc214x/usbmsc: Configuration converted to use the kconfig-frontends tools

configs/Kconfig

@@ -259,9 +259,9 @@ config ARCH_BOARD_MBED
 		that features the NXP LPC1768 microcontroller. This OS is also built
 		with the arm-nuttx-elf toolchain*.  STATUS:  Contributed.
 
-config ARCH_BOARD_MCU123
+config ARCH_BOARD_MCU123_LPC214X
 	bool "mcu123.com LPC2148 Development Board"
-	depends on ARCH_CHIP_LPC2148
+	depends on ARCH_CHIP_LPC214X
 	select ARCH_HAVE_LEDS
 	---help---
 		This port is for the NXP LPC2148 as provided on the mcu123.com
@@ -837,7 +837,7 @@ config ARCH_BOARD_Z8F64200100KIT
 
 config ARCH_BOARD_ZP214XPA
 	bool "The0.net LPC2148 Development Board"
-	depends on ARCH_CHIP_LPC2148
+	depends on ARCH_CHIP_LPC214X
 	---help---
 		This port is for the NXP LPC2148 as provided on the The0.net
 		ZPA213X/4XPA development board. Includes support for the
@@ -911,7 +911,7 @@ config ARCH_BOARD
 	default "lpcxpresso-lpc1768"  if ARCH_BOARD_LPCXPRESSO
 	default "maple"               if ARCH_BOARD_MAPLE
 	default "mbed"                if ARCH_BOARD_MBED
-	default "mcu123-lpc214x"      if ARCH_BOARD_MCU123
+	default "mcu123-lpc214x"      if ARCH_BOARD_MCU123_LPC214X
 	default "micropendous3"       if ARCH_BOARD_MICROPENDOUS3
 	default "mirtoo"              if ARCH_BOARD_MIRTOO
 	default "mx1ads"              if ARCH_BOARD_MX1ADS
@@ -1107,7 +1107,7 @@ endif
 if ARCH_BOARD_MBED
 source "configs/mbed/Kconfig"
 endif
-if ARCH_BOARD_MCU123
+if ARCH_BOARD_MCU123_LPC214X
 source "configs/mcu123-lpc214x/Kconfig"
 endif
 if ARCH_BOARD_MICROPENDOUS3

configs/mcu123-lpc214x/README.txt

@@ -240,7 +240,7 @@ ARM/LPC214X-specific Configuration Options
 
 	CONFIG_ARCH_BOARD_name - For use in C code
 
-	   CONFIG_ARCH_BOARD_MCU123 (for the Spectrum Digital C5471 EVM)
+	   CONFIG_ARCH_BOARD_MCU123_LPC214X (for theMCU123 LPC214x board)
 
 	CONFIG_ARCH_LOOPSPERMSEC - Must be calibrated for correct operation
 	   of delay loops
@@ -386,8 +386,19 @@ usbmsc:
   class driver at system/usbmsc.  See examples/README.txt for
   more information.
 
-  Default toolchain:  Buildroot
+  NOTES:
+ 
+  1. This configuration uses the mconf-based configuration tool.  To
+     change this configuration using that tool, you should:
+
+     a. Build and install the kconfig-mconf tool.  See nuttx/README.txt
+        and misc/tools/
+
+     b. Execute 'make menuconfig' in nuttx/ in order to start the
+        reconfiguration process.
+
+  2. Default toolchain:  Buildroot
      Output format:  ELF and binary
 
-  NOTE:  If you have problems with this configurationt, perhaps it is a
+  3. If you have problems with this configuration, perhaps it is a
      consequence of the last USB driver checking (r4359)

configs/mcu123-lpc214x/nsh/Make.defs

@@ -1,7 +1,7 @@
 ##############################################################################
 # configs/mcu123-lpc214x/nsh/Make.defs
 #
-#   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008-2009, 2011, 2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,14 +35,24 @@
 
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
 
-# The default value for CROSSDEV can be overridden from the make command line:
+ifeq ($(WINTOOL),y)
-#   make                         -- Will build for the NuttX buildroot toolchain
+  # Windows-native toolchains
-#   make CROSSDEV=arm-eabi-      -- Will build for the devkitARM toolchain
+  DIRLINK = $(TOPDIR)/tools/copydir.sh
-#   make CROSSDEV=arm-none-eabi- -- Will build for the CodeSourcery toolchain
+  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
-#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
+  MKDEP = $(TOPDIR)/tools/mknulldeps.sh
+  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
+  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
+else
+  # Linux/Cygwin-native toolchain
+  MKDEP = $(TOPDIR)/tools/mkdeps.sh
+  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
+  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
+endif
 
-CROSSDEV		= arm-nuttx-elf-
 CC = $(CROSSDEV)gcc
 CXX = $(CROSSDEV)g++
 CPP = $(CROSSDEV)gcc -E
@@ -52,8 +62,6 @@ NM			= $(CROSSDEV)nm
 OBJCOPY = $(CROSSDEV)objcopy
 OBJDUMP = $(CROSSDEV)objdump
 
-HOSTOS			=  ${shell uname -o 2>/dev/null || echo "Other"}
-
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
@@ -63,24 +71,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-nuttx-elf-)
+ifeq ("${CONFIG_DEBUG}","y")
-  MKDEP			= $(TOPDIR)/tools/mkdeps.sh
-  ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
-  ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
-  MAXOPTIMIZATION	= -Os
-else
-  WINTOOL		= y
-  DIRLINK		= $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		= $(TOPDIR)/tools/unlink.sh
-  MKDEP			= $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		= -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
-  MAXOPTIMIZATION	= -O2
-endif
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION = -g
 endif
 
@@ -123,13 +114,11 @@ EXEEXT			=
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+ifeq ($(CONFIG_DEBUG),y)
   LDFLAGS += -g
 endif
 
-
 HOSTCC = gcc
 HOSTINCLUDES = -I.
 HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe
 HOSTLDFLAGS =
-

configs/mcu123-lpc214x/nsh/defconfig

@@ -92,7 +92,7 @@ CONFIG_ARM_TOOLCHAIN_GNU_EABIL=y
 #
 # LPC214x Configuration Options
 #
-CONFIG_ARCH_CHIP_LPC2148=y
+CONFIG_ARCH_CHIP_LPC214X=y
 
 #
 # LPC214x Initialization Options
@@ -152,7 +152,7 @@ CONFIG_BOOT_RUNFROMFLASH=y
 #
 # Board Selection
 #
-CONFIG_ARCH_BOARD_MCU123=y
+CONFIG_ARCH_BOARD_MCU123_LPC214X=y
 # CONFIG_ARCH_BOARD_ZP214XPA is not set
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="mcu123-lpc214x"

configs/mcu123-lpc214x/nsh/setenv.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+##############################################################################
 # configs/mcu123-lpc2148/nsh/setenv.sh
 #
 #   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
@@ -31,17 +32,42 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
+##############################################################################
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; then
   echo "You must source this script, not run it!" 1>&2
   exit 1
 fi
 
-if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
-
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+if [ ! -x "setenv.sh" ]; then
-export LPC214XSCRIPTS="$WD/configs/mcu123-lpc214x/scripts"
+  echo "This script must be executed from the top-level NuttX build directory"
-export PATH="${BUILDROOT_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the CodeSourcery
+# toolchain under windows.  You will also have to edit this if you install
+# the CodeSourcery toolchain in any other location
+# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# Add the path to the toolchain to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"

configs/mcu123-lpc214x/usbmsc/Make.defs

@@ -1,7 +1,7 @@
 ##############################################################################
 # configs/mcu123-lpc214x/usbmsc/Make.defs
 #
-#   Copyright (C) 2008-2009, 2011-2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008-2009, 2011-2012, 2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,14 +35,24 @@
 
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
 
-# The default value for CROSSDEV can be overridden from the make command line:
+ifeq ($(WINTOOL),y)
-#   make                         -- Will build for the NuttX buildroot toolchain
+  # Windows-native toolchains
-#   make CROSSDEV=arm-eabi-      -- Will build for the devkitARM toolchain
+  DIRLINK = $(TOPDIR)/tools/copydir.sh
-#   make CROSSDEV=arm-none-eabi- -- Will build for the CodeSourcery toolchain
+  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
-#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
+  MKDEP = $(TOPDIR)/tools/mknulldeps.sh
+  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
+  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
+else
+  # Linux/Cygwin-native toolchain
+  MKDEP = $(TOPDIR)/tools/mkdeps.sh
+  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
+  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
+endif
 
-CROSSDEV		= arm-nuttx-elf-
 CC = $(CROSSDEV)gcc
 CXX = $(CROSSDEV)g++
 CPP = $(CROSSDEV)gcc -E
@@ -52,8 +62,6 @@ NM			= $(CROSSDEV)nm
 OBJCOPY = $(CROSSDEV)objcopy
 OBJDUMP = $(CROSSDEV)objdump
 
-HOSTOS			=  ${shell uname -o 2>/dev/null || echo "Other"}
-
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
@@ -63,24 +71,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-nuttx-elf-)
+ifeq ("${CONFIG_DEBUG}","y")
-  MKDEP			= $(TOPDIR)/tools/mkdeps.sh
-  ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
-  ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
-  MAXOPTIMIZATION	= -Os
-else
-  WINTOOL		= y
-  DIRLINK		= $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK		= $(TOPDIR)/tools/unlink.sh
-  MKDEP			= $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES		= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		= -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
-  MAXOPTIMIZATION	= -O2
-endif
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION = -g
 endif
 
@@ -123,13 +114,11 @@ EXEEXT			=
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+ifeq ($(CONFIG_DEBUG),y)
   LDFLAGS += -g
 endif
 
-
 HOSTCC = gcc
 HOSTINCLUDES = -I.
 HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe
 HOSTLDFLAGS =
-

configs/mcu123-lpc214x/usbmsc/appconfig

@@ -1,39 +0,0 @@
-############################################################################
-# configs/mcu123-lpc214x/usbmsc/appconfig
-#
-#   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.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += system/usbmsc
-

configs/mcu123-lpc214x/usbmsc/setenv.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+##############################################################################
 # configs/mcu123-lpc214x/usbmsc/setenv.sh
 #
 #   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
@@ -31,17 +32,42 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
+##############################################################################
 
-if [ "$(basename $0)" = "setenv.sh" ] ; then
+if [ "$_" = "$0" ] ; then
   echo "You must source this script, not run it!" 1>&2
   exit 1
 fi
 
-if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG="${PATH}"; fi
-
 WD=`pwd`
-export BUILDROOT_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+if [ ! -x "setenv.sh" ]; then
-export LPC214XSCRIPTS="$WD/configs/mcu123-lpc214x/scripts"
+  echo "This script must be executed from the top-level NuttX build directory"
-export PATH="${BUILDROOT_BIN}:${LPC214XSCRIPTS}:/sbin:/usr/sbin:${PATH_ORIG}"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+# This is the Cygwin path to the location where I installed the CodeSourcery
+# toolchain under windows.  You will also have to edit this if you install
+# the CodeSourcery toolchain in any other location
+# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+# export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
+
+# These are the Cygwin paths to the locations where I installed the Atollic
+# toolchain under windows.  You will also have to edit this if you install
+# the Atollic toolchain in any other location.  /usr/bin is added before
+# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
+# at those locations as well.
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
+#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
+
+# This is the Cygwin path to the location where I build the buildroot
+# toolchain.
+export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+
+# Add the path to the toolchain to the PATH varialble
+export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
 
 echo "PATH : ${PATH}"

configs/mcu123-lpc214x/usbserial/defconfig

@@ -39,9 +39,9 @@ CONFIG_ARCH="arm"
 CONFIG_ARCH_ARM=y
 CONFIG_ARCH_ARM7TDMI=y
 CONFIG_ARCH_CHIP="lpc214x"
-CONFIG_ARCH_CHIP_LPC2148=y
+CONFIG_ARCH_CHIP_LPC214X=y
 CONFIG_ARCH_BOARD="mcu123-lpc214x"
-CONFIG_ARCH_BOARD_MCU123=y
+CONFIG_ARCH_BOARD_MCU123_LPC214X=y
 CONFIG_BOARD_LOOPSPERMSEC=3270
 CONFIG_ARCH_LEDS=y
 CONFIG_RAM_SIZE=32768

configs/zp214xpa/nsh/Make.defs

@@ -1,7 +1,7 @@
 ##############################################################################
 # configs/zp214xpa/nsh/Make.defs
 #
-#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,14 +35,24 @@
 
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
 
-# The default value for CROSSDEV can be overridden from the make command line:
+ifeq ($(WINTOOL),y)
-#   make                         -- Will build for the NuttX buildroot toolchain
+  # Windows-native toolchains
-#   make CROSSDEV=arm-eabi-      -- Will build for the devkitARM toolchain
+  DIRLINK = $(TOPDIR)/tools/copydir.sh
-#   make CROSSDEV=arm-none-eabi- -- Will build for the CodeSourcery toolchain
+  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
-#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
+  MKDEP = $(TOPDIR)/tools/mknulldeps.sh
+  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
+  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
+else
+  # Linux/Cygwin-native toolchain
+  MKDEP = $(TOPDIR)/tools/mkdeps.sh
+  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
+  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
+endif
 
-CROSSDEV = arm-nuttx-elf-
 CC = $(CROSSDEV)gcc
 CXX = $(CROSSDEV)g++
 CPP = $(CROSSDEV)gcc -E
@@ -52,8 +62,6 @@ NM = $(CROSSDEV)nm
 OBJCOPY = $(CROSSDEV)objcopy
 OBJDUMP = $(CROSSDEV)objdump
 
-HOSTOS =  ${shell uname -o 2>/dev/null || echo "Other"}
-
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
@@ -63,24 +71,7 @@ OBJCOPYARGS = -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-nuttx-elf-)
+ifeq ("${CONFIG_DEBUG}","y")
-  MKDEP = $(TOPDIR)/tools/mkdeps.sh
-  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
-  MAXOPTIMIZATION = -Os
-else
-  WINTOOL = y
-  DIRLINK = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
-  MKDEP = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
-  MAXOPTIMIZATION = -O2
-endif
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION = -g
 endif
 
@@ -101,7 +92,8 @@ ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
 ARCHWARNINGSXX = -Wall -Wshadow
 ARCHDEFINES =
 
-CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+         $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
 CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
 CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
            $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
@@ -110,7 +102,9 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) \
+                 -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
+                 -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
@@ -120,7 +114,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+ifeq ($(CONFIG_DEBUG),y)
   LDFLAGS += -g
 endif
 

configs/zp214xpa/nsh/defconfig

@@ -92,7 +92,7 @@ CONFIG_ARM_TOOLCHAIN_GNU_EABIL=y
 #
 # LPC214x Configuration Options
 #
-CONFIG_ARCH_CHIP_LPC2148=y
+CONFIG_ARCH_CHIP_LPC214X=y
 
 #
 # LPC214x Initialization Options

configs/zp214xpa/nxlines/Make.defs

@@ -1,7 +1,7 @@
 ##############################################################################
 # configs/zp214xpa/nxlines/Make.defs
 #
-#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,14 +35,24 @@
 
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/arm/Toolchain.defs
 
-# The default value for CROSSDEV can be overridden from the make command line:
+ifeq ($(WINTOOL),y)
-#   make                         -- Will build for the NuttX buildroot toolchain
+  # Windows-native toolchains
-#   make CROSSDEV=arm-eabi-      -- Will build for the devkitARM toolchain
+  DIRLINK = $(TOPDIR)/tools/copydir.sh
-#   make CROSSDEV=arm-none-eabi- -- Will build for the CodeSourcery toolchain
+  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
-#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
+  MKDEP = $(TOPDIR)/tools/mknulldeps.sh
+  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
+  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
+else
+  # Linux/Cygwin-native toolchain
+  MKDEP = $(TOPDIR)/tools/mkdeps.sh
+  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
+  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
+endif
 
-CROSSDEV = arm-nuttx-elf-
 CC = $(CROSSDEV)gcc
 CXX = $(CROSSDEV)g++
 CPP = $(CROSSDEV)gcc -E
@@ -52,8 +62,6 @@ NM = $(CROSSDEV)nm
 OBJCOPY = $(CROSSDEV)objcopy
 OBJDUMP = $(CROSSDEV)objdump
 
-HOSTOS =  ${shell uname -o 2>/dev/null || echo "Other"}
-
 ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
@@ -63,24 +71,7 @@ OBJCOPYARGS = -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-nuttx-elf-)
+ifeq ("${CONFIG_DEBUG}","y")
-  MKDEP = $(TOPDIR)/tools/mkdeps.sh
-  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
-  MAXOPTIMIZATION = -Os
-else
-  WINTOOL = y
-  DIRLINK = $(TOPDIR)/tools/copydir.sh
-  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
-  MKDEP = $(TOPDIR)/tools/mknulldeps.sh
-  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
-  MAXOPTIMIZATION = -O2
-endif
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION = -g
 endif
 
@@ -101,7 +92,8 @@ ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
 ARCHWARNINGSXX = -Wall -Wshadow
 ARCHDEFINES =
 
-CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+         $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
 CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
 CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
            $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
@@ -110,7 +102,9 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) \
+                 -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
+                 -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
@@ -120,7 +114,7 @@ EXEEXT =
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+ifeq ($(CONFIG_DEBUG),y)
   LDFLAGS += -g
 endif
 

configs/zp214xpa/nxlines/defconfig

@@ -92,7 +92,7 @@ CONFIG_ARM_TOOLCHAIN_GNU_EABIL=y
 #
 # LPC214x Configuration Options
 #
-CONFIG_ARCH_CHIP_LPC2148=y
+CONFIG_ARCH_CHIP_LPC214X=y
 
 #
 # LPC214x Initialization Options