From 7577dba2c3d15322891d28e214654f5fcfcd6a47 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 11 Jul 2017 11:40:27 -0600
Subject: [PATCH] Move remaining, unique Make.defs files into scripts
 directory.

---
 configs/nucleo-f072rb/scripts/Make.defs              | 2 +-
 configs/nucleo-f091rc/scripts/Make.defs              | 2 +-
 configs/nucleo-l432kc/scripts/Make.defs              | 4 ++--
 configs/nucleo-l452re/scripts/Make.defs              | 4 ++--
 configs/nucleo-l476rg/scripts/Make.defs              | 4 ++--
 configs/nutiny-nuc120/scripts/Make.defs              | 6 +++---
 configs/nutiny-nuc120/scripts/nutiny-nuc120.ld       | 4 ++--
 configs/p112/scripts/Make.defs                       | 4 ++--
 configs/pcblogic-pic32mx/scripts/Make.defs           | 8 ++++----
 configs/pcblogic-pic32mx/scripts/pcblogic-pic32mx.ld | 4 ++--
 configs/pcduino-a10/scripts/Make.defs                | 4 ++--
 configs/pic32mx7mmb/scripts/Make.defs                | 4 ++--
 configs/pic32mz-starterkit/scripts/Make.defs         | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/configs/nucleo-f072rb/scripts/Make.defs b/configs/nucleo-f072rb/scripts/Make.defs
index d4573469db..193a55cf15 100644
--- a/configs/nucleo-f072rb/scripts/Make.defs
+++ b/configs/nucleo-f072rb/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/nucleo-f072rb/nsh/Make.defs
+# configs/nucleo-f072rb/scripts/Make.defs
 #
 #   Copyright (C) 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/nucleo-f091rc/scripts/Make.defs b/configs/nucleo-f091rc/scripts/Make.defs
index eb0863ab3d..9d550aad3c 100644
--- a/configs/nucleo-f091rc/scripts/Make.defs
+++ b/configs/nucleo-f091rc/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# configs/nucleo-f091rc/nsh/Make.defs
+# configs/nucleo-f091rc/scripts/Make.defs
 #
 #   Copyright (C) 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/nucleo-l432kc/scripts/Make.defs b/configs/nucleo-l432kc/scripts/Make.defs
index 8276975feb..0a238f8f16 100644
--- a/configs/nucleo-l432kc/scripts/Make.defs
+++ b/configs/nucleo-l432kc/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/nucleo-l432kc/nsh/Make.defs
+# configs/nucleo-l432kc/scripts/Make.defs
 #
-#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/nucleo-l452re/scripts/Make.defs b/configs/nucleo-l452re/scripts/Make.defs
index 39adcf7611..b0bbb336ee 100644
--- a/configs/nucleo-l452re/scripts/Make.defs
+++ b/configs/nucleo-l452re/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/nucleo-l452re/nsh/Make.defs
+# configs/nucleo-l452re/scripts/Make.defs
 #
-#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/nucleo-l476rg/scripts/Make.defs b/configs/nucleo-l476rg/scripts/Make.defs
index 7e03d46bb3..f753acc705 100644
--- a/configs/nucleo-l476rg/scripts/Make.defs
+++ b/configs/nucleo-l476rg/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/nucleo-l476rg/nsh/Make.defs
+# configs/nucleo-l476rg/scripts/Make.defs
 #
-#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/nutiny-nuc120/scripts/Make.defs b/configs/nutiny-nuc120/scripts/Make.defs
index 80ac8de12f..0ac212cc4e 100644
--- a/configs/nutiny-nuc120/scripts/Make.defs
+++ b/configs/nutiny-nuc120/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/nutiny-nuc120/nsh/Make.defs
+# configs/nutiny-nuc120/scripts/Make.defs
 #
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,7 +37,7 @@ include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 include ${TOPDIR}/arch/arm/src/armv6-m/Toolchain.defs
 
-LDSCRIPT = ld.script
+LDSCRIPT = nutiny-nuc120.ld
 
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
diff --git a/configs/nutiny-nuc120/scripts/nutiny-nuc120.ld b/configs/nutiny-nuc120/scripts/nutiny-nuc120.ld
index 3709d1d8f0..4c1d8a41d8 100644
--- a/configs/nutiny-nuc120/scripts/nutiny-nuc120.ld
+++ b/configs/nutiny-nuc120/scripts/nutiny-nuc120.ld
@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/nutiny-nuc120/scripts/ld.script
+ * configs/nutiny-nuc120/scripts/nutiny-nuc120.ld
  *
- *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/configs/p112/scripts/Make.defs b/configs/p112/scripts/Make.defs
index 1529640faf..fdc0265ffa 100644
--- a/configs/p112/scripts/Make.defs
+++ b/configs/p112/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/p112/ostest/Make.defs
+# configs/p112/scripts/Make.defs
 #
-#   Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2012, 2014, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/pcblogic-pic32mx/scripts/Make.defs b/configs/pcblogic-pic32mx/scripts/Make.defs
index ed3b800bf6..924927477a 100644
--- a/configs/pcblogic-pic32mx/scripts/Make.defs
+++ b/configs/pcblogic-pic32mx/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/pcblogic-pic32mx/nsh/Make.defs
+# configs/pcblogic-pic32mx/scripts/Make.defs
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,13 +44,13 @@ ifeq ($(WINTOOL),y)
   MKDEP = $(TOPDIR)/tools/mkwindeps.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)/nsh/ld.script}"
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/pcblogic-pic32mx.ld}"
 else
   # Linux/Cygwin-native toolchain
   MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
   ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/pcblogic-pic32mx.ld
 endif
 
 CC = $(CROSSDEV)gcc
diff --git a/configs/pcblogic-pic32mx/scripts/pcblogic-pic32mx.ld b/configs/pcblogic-pic32mx/scripts/pcblogic-pic32mx.ld
index f80cc04365..b73e243bd0 100644
--- a/configs/pcblogic-pic32mx/scripts/pcblogic-pic32mx.ld
+++ b/configs/pcblogic-pic32mx/scripts/pcblogic-pic32mx.ld
@@ -1,7 +1,7 @@
 /****************************************************************************
- * configs/pcblogic-pic32mx/nsh/ld.script
+ * configs/pcblogic-pic32mx/scripts/pcblogic-pic32mx.ld
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/configs/pcduino-a10/scripts/Make.defs b/configs/pcduino-a10/scripts/Make.defs
index 1a9d6fc14e..ee2a17e38f 100644
--- a/configs/pcduino-a10/scripts/Make.defs
+++ b/configs/pcduino-a10/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/pcduino-a10/nsh/Make.defs
+# configs/pcduino-a10/scripts/Make.defs
 #
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/pic32mx7mmb/scripts/Make.defs b/configs/pic32mx7mmb/scripts/Make.defs
index 31afe6e928..fcf3320242 100644
--- a/configs/pic32mx7mmb/scripts/Make.defs
+++ b/configs/pic32mx7mmb/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/pic32mx7mmb/nsh/Make.defs
+# configs/pic32mx7mmb/scripts/Make.defs
 #
-#   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/pic32mz-starterkit/scripts/Make.defs b/configs/pic32mz-starterkit/scripts/Make.defs
index 8d17ed253a..0a1ccd8f73 100644
--- a/configs/pic32mz-starterkit/scripts/Make.defs
+++ b/configs/pic32mz-starterkit/scripts/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
-# configs/pic32mz-starterkit/nsh/Make.defs
+# configs/pic32mz-starterkit/scripts/Make.defs
 #
-#   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without