From 2fa83cb52a17d770ad932b22b227c044a8f5d973 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 11 Jul 2017 10:39:17 -0600 Subject: [PATCH] Move remaining, unique Make.defs files into scripts directory. --- configs/amber/{hello => scripts}/Make.defs | 8 ++++---- configs/amber/{hello/ld.script => scripts/hello.ld} | 4 ++-- .../nsh => arduino-due/scripts}/Make.defs | 10 ++++------ .../arduino-due/scripts/{ld.script => arduino-due.ld} | 4 ++-- .../nsh => cc3200-launchpad/scripts}/Make.defs | 10 ++++++---- .../scripts/{ld.script => cc3200-launchpad.ld} | 2 +- configs/cloudctrl/{nsh => scripts}/Make.defs | 6 +++--- .../scripts/{ld.script.dfu => cloudctrl-dfu.ld} | 2 +- configs/cloudctrl/scripts/{ld.script => cloudctrl.ld} | 2 +- configs/demo9s12ne64/{ostest => scripts}/Make.defs | 8 ++++---- .../demo9s12ne64-banked.ld} | 4 ++-- .../demo9s12ne64-unbanked.ld} | 4 ++-- configs/ea3152/{ostest => scripts}/Make.defs | 8 ++++---- configs/ea3152/scripts/{ld.script => ea3152.ld} | 4 ++-- 14 files changed, 38 insertions(+), 38 deletions(-) rename configs/amber/{hello => scripts}/Make.defs (94%) rename configs/amber/{hello/ld.script => scripts/hello.ld} (98%) rename configs/{cc3200-launchpad/nsh => arduino-due/scripts}/Make.defs (96%) rename configs/arduino-due/scripts/{ld.script => arduino-due.ld} (96%) rename configs/{arduino-due/nsh => cc3200-launchpad/scripts}/Make.defs (96%) rename configs/cc3200-launchpad/scripts/{ld.script => cc3200-launchpad.ld} (98%) rename configs/cloudctrl/{nsh => scripts}/Make.defs (97%) rename configs/cloudctrl/scripts/{ld.script.dfu => cloudctrl-dfu.ld} (98%) rename configs/cloudctrl/scripts/{ld.script => cloudctrl.ld} (98%) rename configs/demo9s12ne64/{ostest => scripts}/Make.defs (96%) rename configs/demo9s12ne64/{ostest/ld.script.banked => scripts/demo9s12ne64-banked.ld} (97%) rename configs/demo9s12ne64/{ostest/ld.script.nonbanked => scripts/demo9s12ne64-unbanked.ld} (96%) rename configs/ea3152/{ostest => scripts}/Make.defs (96%) rename configs/ea3152/scripts/{ld.script => ea3152.ld} (96%) diff --git a/configs/amber/hello/Make.defs b/configs/amber/scripts/Make.defs similarity index 94% rename from configs/amber/hello/Make.defs rename to configs/amber/scripts/Make.defs index f29c795612d..8b9842e9205 100644 --- a/configs/amber/hello/Make.defs +++ b/configs/amber/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/amber/hello/Make.defs +# configs/amber/scripts/Make.defs # -# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # 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 = $(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/hello.ld}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT) 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/hello.ld endif CC = $(CROSSDEV)gcc diff --git a/configs/amber/hello/ld.script b/configs/amber/scripts/hello.ld similarity index 98% rename from configs/amber/hello/ld.script rename to configs/amber/scripts/hello.ld index af7eed6f303..82bae0dc8a2 100644 --- a/configs/amber/hello/ld.script +++ b/configs/amber/scripts/hello.ld @@ -1,7 +1,7 @@ /************************************************************************************** - * configs/amber/hello/ld.script + * configs/amber/scripts/hello.ld * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/configs/cc3200-launchpad/nsh/Make.defs b/configs/arduino-due/scripts/Make.defs similarity index 96% rename from configs/cc3200-launchpad/nsh/Make.defs rename to configs/arduino-due/scripts/Make.defs index 42caa758dc5..657c25924c8 100644 --- a/configs/cc3200-launchpad/nsh/Make.defs +++ b/configs/arduino-due/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/cc3200-launchpad/nsh/Make.defs +# configs/arduino-due/scripts/Make.defs # -# Copyright (C) 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # 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)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/arduino-due.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)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/arduino-due.ld endif CC = $(CROSSDEV)gcc @@ -103,9 +103,7 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y) LDFLAGS += -g endif - HOSTCC = gcc HOSTINCLUDES = -I. HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe HOSTLDFLAGS = - diff --git a/configs/arduino-due/scripts/ld.script b/configs/arduino-due/scripts/arduino-due.ld similarity index 96% rename from configs/arduino-due/scripts/ld.script rename to configs/arduino-due/scripts/arduino-due.ld index 66ba17e8d97..4a250f6eb84 100644 --- a/configs/arduino-due/scripts/ld.script +++ b/configs/arduino-due/scripts/arduino-due.ld @@ -1,7 +1,7 @@ /**************************************************************************** - * configs/arduino-due/scripts/ld.script + * configs/arduino-due/scripts/arduino-due.ld * - * Copyright (C) 2013 Gregory Nutt. All rights reserved. + * Copyright (C) 2013, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/configs/arduino-due/nsh/Make.defs b/configs/cc3200-launchpad/scripts/Make.defs similarity index 96% rename from configs/arduino-due/nsh/Make.defs rename to configs/cc3200-launchpad/scripts/Make.defs index b4601eb781b..671d9a3b381 100644 --- a/configs/arduino-due/nsh/Make.defs +++ b/configs/cc3200-launchpad/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/arduino-due/nsh/Make.defs +# configs/cc3200-launchpad/scripts/Make.defs # -# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # 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)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/cc3200-launchpad.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)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/cc3200-launchpad.ld endif CC = $(CROSSDEV)gcc @@ -103,7 +103,9 @@ ifeq ($(CONFIG_DEBUG_SYMBOLS),y) LDFLAGS += -g endif + HOSTCC = gcc HOSTINCLUDES = -I. HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe HOSTLDFLAGS = + diff --git a/configs/cc3200-launchpad/scripts/ld.script b/configs/cc3200-launchpad/scripts/cc3200-launchpad.ld similarity index 98% rename from configs/cc3200-launchpad/scripts/ld.script rename to configs/cc3200-launchpad/scripts/cc3200-launchpad.ld index 292597615cc..79282624044 100644 --- a/configs/cc3200-launchpad/scripts/ld.script +++ b/configs/cc3200-launchpad/scripts/cc3200-launchpad.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/cc3200-launchpad/scripts/ld.script + * configs/cc3200-launchpad/scripts/cc3200-launchpad.ld * * Copyright (C) 2013 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt diff --git a/configs/cloudctrl/nsh/Make.defs b/configs/cloudctrl/scripts/Make.defs similarity index 97% rename from configs/cloudctrl/nsh/Make.defs rename to configs/cloudctrl/scripts/Make.defs index e2befae18ee..31a64708890 100644 --- a/configs/cloudctrl/nsh/Make.defs +++ b/configs/cloudctrl/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# configs/cloudctrl/nsh/Make.defs +# configs/cloudctrl/scripts/Make.defs # # Copyright (C) 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -40,9 +40,9 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs # Pick the linker script ifeq ($(CONFIG_STM32_DFU),y) - LDSCRIPT = ld.script.dfu + LDSCRIPT = cloudctrl-dfu.ld else - LDSCRIPT = ld.script + LDSCRIPT = cloudctrl.ld endif ifeq ($(WINTOOL),y) diff --git a/configs/cloudctrl/scripts/ld.script.dfu b/configs/cloudctrl/scripts/cloudctrl-dfu.ld similarity index 98% rename from configs/cloudctrl/scripts/ld.script.dfu rename to configs/cloudctrl/scripts/cloudctrl-dfu.ld index 9cab21406db..e040b22eed5 100644 --- a/configs/cloudctrl/scripts/ld.script.dfu +++ b/configs/cloudctrl/scripts/cloudctrl-dfu.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/cloudctrl/scripts/ld.script.dfu + * configs/cloudctrl/scripts/cloudctrl-dfu.ld * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/cloudctrl/scripts/ld.script b/configs/cloudctrl/scripts/cloudctrl.ld similarity index 98% rename from configs/cloudctrl/scripts/ld.script rename to configs/cloudctrl/scripts/cloudctrl.ld index 139b964684b..1862e9baab4 100644 --- a/configs/cloudctrl/scripts/ld.script +++ b/configs/cloudctrl/scripts/cloudctrl.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/cloudctrl/scripts/ld.script + * configs/cloudctrl/scripts/cloudctrl.ld * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/demo9s12ne64/ostest/Make.defs b/configs/demo9s12ne64/scripts/Make.defs similarity index 96% rename from configs/demo9s12ne64/ostest/Make.defs rename to configs/demo9s12ne64/scripts/Make.defs index ade31496484..be9a67ac2d8 100644 --- a/configs/demo9s12ne64/ostest/Make.defs +++ b/configs/demo9s12ne64/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/demo9s12ne64/ostest/Make.defs +# configs/demo9s12ne64/scripts/Make.defs # -# Copyright (C) 2009 Gregory Nutt. All rights reserved. +# Copyright (C) 2009,2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -45,10 +45,10 @@ WINTOOL = n ifeq ($(CONFIG_HCS12_NONBANKED),y) ARCHCPUFLAGS = -m9s12x -mshort -mnolong-calls - LDSCRIPT = ld.script.nonbanked + LDSCRIPT = demo9s12ne64-unbanked.ld else ARCHCPUFLAGS = -m9s12x -mshort -mlong-calls - LDSCRIPT = ld.script.banked + LDSCRIPT = demo9s12ne64-banked.ld endif ifneq ($(CONFIG_HCS12_MSOFTREGS),0) diff --git a/configs/demo9s12ne64/ostest/ld.script.banked b/configs/demo9s12ne64/scripts/demo9s12ne64-banked.ld similarity index 97% rename from configs/demo9s12ne64/ostest/ld.script.banked rename to configs/demo9s12ne64/scripts/demo9s12ne64-banked.ld index 812f5f19cab..f0735371851 100644 --- a/configs/demo9s12ne64/ostest/ld.script.banked +++ b/configs/demo9s12ne64/scripts/demo9s12ne64-banked.ld @@ -1,7 +1,7 @@ /**************************************************************************** - * configs/demo9s12ne64/ostest/ld.script + * configs/demo9s12ne64/ostest/demo9s12ne64-banked.ld * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/configs/demo9s12ne64/ostest/ld.script.nonbanked b/configs/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld similarity index 96% rename from configs/demo9s12ne64/ostest/ld.script.nonbanked rename to configs/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld index fae728f6298..09479e01347 100644 --- a/configs/demo9s12ne64/ostest/ld.script.nonbanked +++ b/configs/demo9s12ne64/scripts/demo9s12ne64-unbanked.ld @@ -1,7 +1,7 @@ /**************************************************************************** - * configs/demo9s12ne64/ostest/ld.script + * configs/demo9s12ne64/ostest/demo9s12ne64-banked.ld * - * Copyright (C) 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/configs/ea3152/ostest/Make.defs b/configs/ea3152/scripts/Make.defs similarity index 96% rename from configs/ea3152/ostest/Make.defs rename to configs/ea3152/scripts/Make.defs index c905c78101f..5d899560b42 100644 --- a/configs/ea3152/ostest/Make.defs +++ b/configs/ea3152/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/ea3152/ostest/Make.defs +# configs/ea3152/scripts/Make.defs # -# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2012, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # 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)/scripts/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ea3152.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)/scripts/ld.script + ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ea3152.ld endif CC = $(CROSSDEV)gcc diff --git a/configs/ea3152/scripts/ld.script b/configs/ea3152/scripts/ea3152.ld similarity index 96% rename from configs/ea3152/scripts/ld.script rename to configs/ea3152/scripts/ea3152.ld index ff1578df2a7..f6d01c92ad4 100644 --- a/configs/ea3152/scripts/ld.script +++ b/configs/ea3152/scripts/ea3152.ld @@ -1,7 +1,7 @@ /**************************************************************************** - * configs/ea3152/scripts/ld.script + * configs/ea3152/scripts/ea3152.ld * - * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2011-2012, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without