Use common naming for all buildroot toolchains

7 files changed, 23 insertions, 29 deletions

diff --git a/nuttx/configs/ntosd-dm320/README.txt b/nuttx/configs/ntosd-dm320/README.txt
index a02255ffa..8a3205154 100644
--- a/nuttx/configs/ntosd-dm320/README.txt
+++ b/nuttx/configs/ntosd-dm320/README.txt
@@ -63,13 +63,13 @@ GNU Toolchain Options
   add one of the following configuration options to your .config (or defconfig)
   file:
 
-    CONFIG_DM320_CODESOURCERYW=y  : CodeSourcery under Windows
-    CONFIG_DM320_CODESOURCERYL=y  : CodeSourcery under Linux
-    CONFIG_DM320_DEVKITARM=y      : devkitARM under Windows
-    CONFIG_DM320_BUILDROOT=y	    : NuttX buildroot under Linux or Cygwin (default)
+    CONFIG_ARM_TOOLCHAIN_CODESOURCERYW=y  : CodeSourcery under Windows
+    CONFIG_ARM_TOOLCHAIN_CODESOURCERYL=y  : CodeSourcery under Linux
+    CONFIG_ARM_TOOLCHAIN_DEVKITARM=y      : devkitARM under Windows
+    CONFIG_ARM_TOOLCHAIN_BUILDROOT=y	    : NuttX buildroot under Linux or Cygwin (default)
     CONFIG_ARM_TOOLCHAIN_GNU_EABIL : Generic arm-none-eabi toolchain
 
-  If you are not using CONFIG_DM320_BUILDROOT, then you may also have to modify
+  If you are not using CONFIG_ARM_TOOLCHAIN_BUILDROOT, then you may also have to modify
   the PATH in the setenv.h file if your make cannot find the tools.
 
   The toolchain may also be set using the kconfig-mconf utility (make menuconfig)
diff --git a/nuttx/configs/ntosd-dm320/nettest/Make.defs b/nuttx/configs/ntosd-dm320/nettest/Make.defs
index b2d236d43..ae2d26f41 100644
--- a/nuttx/configs/ntosd-dm320/nettest/Make.defs
+++ b/nuttx/configs/ntosd-dm320/nettest/Make.defs
@@ -107,10 +107,9 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-#[blf] The `ea3131' had this, but despite using buildroot, neuros doesn't...
-###	ifneq ($(CONFIG_LPC313X_BUILDROOT),y)	### change to ...DM320...
-###	  LDFLAGS += -nostartfiles -nodefaultlibs
-###	endif
+ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y)
+  LDFLAGS += -nostartfiles -nodefaultlibs
+endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   LDFLAGS		+= -g
 endif
diff --git a/nuttx/configs/ntosd-dm320/nsh/Make.defs b/nuttx/configs/ntosd-dm320/nsh/Make.defs
index 703860fcb..35cd1bc30 100644
--- a/nuttx/configs/ntosd-dm320/nsh/Make.defs
+++ b/nuttx/configs/ntosd-dm320/nsh/Make.defs
@@ -107,10 +107,9 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-#[blf] The `ea3131' had this, but despite using buildroot, neuros doesn't...
-###	ifneq ($(CONFIG_LPC313X_BUILDROOT),y)	### change to ...DM320...
-###	  LDFLAGS += -nostartfiles -nodefaultlibs
-###	endif
+ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y)
+  LDFLAGS += -nostartfiles -nodefaultlibs
+endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   LDFLAGS		+= -g
 endif
diff --git a/nuttx/configs/ntosd-dm320/poll/Make.defs b/nuttx/configs/ntosd-dm320/poll/Make.defs
index 4f46617c4..3542b8cc6 100644
--- a/nuttx/configs/ntosd-dm320/poll/Make.defs
+++ b/nuttx/configs/ntosd-dm320/poll/Make.defs
@@ -107,10 +107,9 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-#[blf] The `ea3131' had this, but despite using buildroot, neuros doesn't...
-###	ifneq ($(CONFIG_LPC313X_BUILDROOT),y)	### change to ...DM320...
-###	  LDFLAGS += -nostartfiles -nodefaultlibs
-###	endif
+ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y)
+  LDFLAGS += -nostartfiles -nodefaultlibs
+endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   LDFLAGS		+= -g
 endif
diff --git a/nuttx/configs/ntosd-dm320/thttpd/Make.defs b/nuttx/configs/ntosd-dm320/thttpd/Make.defs
index ffc579b37..590ee75fe 100644
--- a/nuttx/configs/ntosd-dm320/thttpd/Make.defs
+++ b/nuttx/configs/ntosd-dm320/thttpd/Make.defs
@@ -107,10 +107,9 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-#[blf] The `ea3131' had this, but despite using buildroot, neuros doesn't...
-###	ifneq ($(CONFIG_LPC313X_BUILDROOT),y)	### change to ...DM320...
-###	  LDFLAGS += -nostartfiles -nodefaultlibs
-###	endif
+ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y)
+   LDFLAGS += -nostartfiles -nodefaultlibs
+endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   LDFLAGS		+= -g
 endif
diff --git a/nuttx/configs/ntosd-dm320/udp/Make.defs b/nuttx/configs/ntosd-dm320/udp/Make.defs
index 1aacd7363..333fa8d24 100644
--- a/nuttx/configs/ntosd-dm320/udp/Make.defs
+++ b/nuttx/configs/ntosd-dm320/udp/Make.defs
@@ -107,10 +107,9 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-#[blf] The `ea3131' had this, but despite using buildroot, neuros doesn't...
-###	ifneq ($(CONFIG_LPC313X_BUILDROOT),y)	### change to ...DM320...
-###	  LDFLAGS += -nostartfiles -nodefaultlibs
-###	endif
+ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y)
+  LDFLAGS += -nostartfiles -nodefaultlibs
+endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   LDFLAGS		+= -g
 endif
diff --git a/nuttx/configs/ntosd-dm320/uip/Make.defs b/nuttx/configs/ntosd-dm320/uip/Make.defs
index d214c4d6c..f4fdaad67 100644
--- a/nuttx/configs/ntosd-dm320/uip/Make.defs
+++ b/nuttx/configs/ntosd-dm320/uip/Make.defs
@@ -107,10 +107,9 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-#[blf] The `ea3131' had this, but despite using buildroot, neuros doesn't...
-###	ifneq ($(CONFIG_LPC313X_BUILDROOT),y)	### change to ...DM320...
-###	  LDFLAGS += -nostartfiles -nodefaultlibs
-###	endif
+ifneq ($(CONFIG_ARM_TOOLCHAIN_BUILDROOT),y)
+   LDFLAGS += -nostartfiles -nodefaultlibs
+endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   LDFLAGS		+= -g
 endif