diff --git a/configs/efm32-g8xx-stk/nsh/Make.defs b/configs/efm32-g8xx-stk/scripts/Make.defs similarity index 96% rename from configs/efm32-g8xx-stk/nsh/Make.defs rename to configs/efm32-g8xx-stk/scripts/Make.defs index 88aa236c8db..a1e02cc0ce9 100644 --- a/configs/efm32-g8xx-stk/nsh/Make.defs +++ b/configs/efm32-g8xx-stk/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/efm32-g8xx-stk/nsh/Make.defs +# configs/efm32-g8xx-stk/scripts/Make.defs # -# Copyright (C) 2014 Gregory Nutt. All rights reserved. +# Copyright (C) 2014m 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -37,7 +37,7 @@ include ${TOPDIR}/.config include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs include ${TOPDIR}/tools/Config.mk -LDSCRIPT = ld.script +LDSCRIPT = efm32-g8xx-stk.ld ifeq ($(WINTOOL),y) # Windows-native toolchains diff --git a/configs/efm32-g8xx-stk/scripts/ld.script b/configs/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld similarity index 96% rename from configs/efm32-g8xx-stk/scripts/ld.script rename to configs/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld index a9e6c2202f2..d199bd1e64a 100644 --- a/configs/efm32-g8xx-stk/scripts/ld.script +++ b/configs/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld @@ -1,7 +1,7 @@ /**************************************************************************** - * configs/efm32-g8xx-stk/scripts/ld.script + * configs/efm32-g8xx-stk/scripts/efm32-g8xx-stk.ld * - * Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2014, 2017 Gregory Nutt. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/configs/ekk-lm3s9b96/nsh/Make.defs b/configs/ekk-lm3s9b96/scripts/Make.defs similarity index 96% rename from configs/ekk-lm3s9b96/nsh/Make.defs rename to configs/ekk-lm3s9b96/scripts/Make.defs index 7fdee356dcb..3df32d4067e 100644 --- a/configs/ekk-lm3s9b96/nsh/Make.defs +++ b/configs/ekk-lm3s9b96/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/ekk-lm3s9b96/nsh/Make.defs +# configs/ekk-lm3s9b96/scripts/Make.defs # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved. # Authors: Gregory Nutt # Jose Pablo Rojas V. # @@ -45,13 +45,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/ekk-lm3s9b96.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/ekk-lm3s9b96.ld endif CC = $(CROSSDEV)gcc diff --git a/configs/ekk-lm3s9b96/scripts/ld.script b/configs/ekk-lm3s9b96/scripts/ekk-lm3s9b96.ld similarity index 96% rename from configs/ekk-lm3s9b96/scripts/ld.script rename to configs/ekk-lm3s9b96/scripts/ekk-lm3s9b96.ld index a85999f6e69..864c2159d1b 100644 --- a/configs/ekk-lm3s9b96/scripts/ld.script +++ b/configs/ekk-lm3s9b96/scripts/ekk-lm3s9b96.ld @@ -1,7 +1,7 @@ /**************************************************************************** - * configs/ekk-lm3s9b96/ostest/ld.script + * configs/ekk-lm3s9b96/ostest/ekk-lm3s9b96.ld * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt * Jose Pablo Rojas V. * diff --git a/configs/fire-stm32v2/nsh/Make.defs b/configs/fire-stm32v2/scripts/Make.defs similarity index 96% rename from configs/fire-stm32v2/nsh/Make.defs rename to configs/fire-stm32v2/scripts/Make.defs index a9dd58a11e6..39e5fb87067 100644 --- a/configs/fire-stm32v2/nsh/Make.defs +++ b/configs/fire-stm32v2/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/fire-stm32v2/nsh/Make.defs +# configs/fire-stm32v2/scripts/Make.defs # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -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 = fire-stm32v2-dfu.ld else - LDSCRIPT = ld.script + LDSCRIPT = fire-stm32v2.ld endif ifeq ($(WINTOOL),y) diff --git a/configs/fire-stm32v2/scripts/ld.script b/configs/fire-stm32v2/scripts/ld.script deleted file mode 100644 index 225af3834bf..00000000000 --- a/configs/fire-stm32v2/scripts/ld.script +++ /dev/null @@ -1,118 +0,0 @@ -/**************************************************************************** - * configs/fire-stm32v2/scripts/ld.script - * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * 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. - * - ****************************************************************************/ - -/* The STM32F103VET6 has 512Kb of FLASH beginning at address 0x0800:0000 and - * 64Kb of SRAM beginning at address 0x2000:0000. When booting from FLASH, - * FLASH memory is aliased to address 0x0000:0000 where the code expects to - * begin execution by jumping to the entry point in the 0x0800:0000 address - * range. - */ - -MEMORY -{ - flash (rx) : ORIGIN = 0x08000000, LENGTH = 512K - sram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K -} - -OUTPUT_ARCH(arm) -ENTRY(_stext) -SECTIONS -{ - .text : { - _stext = ABSOLUTE(.); - *(.vectors) - *(.text .text.*) - *(.fixup) - *(.gnu.warning) - *(.rodata .rodata.*) - *(.gnu.linkonce.t.*) - *(.glue_7) - *(.glue_7t) - *(.got) - *(.gcc_except_table) - *(.gnu.linkonce.r.*) - _etext = ABSOLUTE(.); - } > flash - - .init_section : { - _sinit = ABSOLUTE(.); - *(.init_array .init_array.*) - _einit = ABSOLUTE(.); - } > flash - - .ARM.extab : { - *(.ARM.extab*) - } > flash - - __exidx_start = ABSOLUTE(.); - .ARM.exidx : { - *(.ARM.exidx*) - } > flash - __exidx_end = ABSOLUTE(.); - - _eronly = ABSOLUTE(.); - - /* The STM32F103Z has 64Kb of SRAM beginning at the following address */ - - .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 - - /* 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) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_info 0 : { *(.debug_info) } - .debug_line 0 : { *(.debug_line) } - .debug_pubnames 0 : { *(.debug_pubnames) } - .debug_aranges 0 : { *(.debug_aranges) } -} diff --git a/configs/fire-stm32v2/scripts/ld.script.dfu b/configs/fire-stm32v2/scripts/ld.script.dfu deleted file mode 100644 index fd6576cc318..00000000000 --- a/configs/fire-stm32v2/scripts/ld.script.dfu +++ /dev/null @@ -1,117 +0,0 @@ -/**************************************************************************** - * configs/fire-stm32v2/scripts/ld.script.dfu - * - * Copyright (C) 2012 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * 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. - * - ****************************************************************************/ - -/* The STM32F103VET6 has 512Kb of FLASH beginning at address 0x0800:0000 and - * 64Kb of SRAM beginning at address 0x2000:0000. Here we assume that the - * STM3210E-EVAL's DFU bootloader is being used. In that case, the corrct - * load .text load address is 0x08003000 (leaving 464Kb). - */ - -MEMORY -{ - flash (rx) : ORIGIN = 0x08003000, LENGTH = 464K - sram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K -} - -OUTPUT_ARCH(arm) -ENTRY(_stext) -SECTIONS -{ - .text : { - _stext = ABSOLUTE(.); - *(.vectors) - *(.text .text.*) - *(.fixup) - *(.gnu.warning) - *(.rodata .rodata.*) - *(.gnu.linkonce.t.*) - *(.glue_7) - *(.glue_7t) - *(.got) - *(.gcc_except_table) - *(.gnu.linkonce.r.*) - _etext = ABSOLUTE(.); - } > flash - - .init_section : { - _sinit = ABSOLUTE(.); - *(.init_array .init_array.*) - _einit = ABSOLUTE(.); - } > flash - - .ARM.extab : { - *(.ARM.extab*) - } > flash - - __exidx_start = ABSOLUTE(.); - .ARM.exidx : { - *(.ARM.exidx*) - } > flash - __exidx_end = ABSOLUTE(.); - - _eronly = ABSOLUTE(.); - - /* The STM32F103Z has 64Kb of SRAM beginning at the following address */ - - .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 - - /* 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) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_info 0 : { *(.debug_info) } - .debug_line 0 : { *(.debug_line) } - .debug_pubnames 0 : { *(.debug_pubnames) } - .debug_aranges 0 : { *(.debug_aranges) } -} diff --git a/configs/freedom-kl26z/nsh/Make.defs b/configs/freedom-kl25z/scripts/Make.defs similarity index 97% rename from configs/freedom-kl26z/nsh/Make.defs rename to configs/freedom-kl25z/scripts/Make.defs index 4d982e93b7f..7ff762af0d7 100644 --- a/configs/freedom-kl26z/nsh/Make.defs +++ b/configs/freedom-kl25z/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/freedom-kl26z/nsh/Make.defs +# configs/freedom-kl25z/scripts/Make.defs # -# Copyright (C) 2015 Gregory Nutt. All rights reserved. +# Copyright (C) 2013m, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # 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 = freedom-kl25z.ld ifeq ($(WINTOOL),y) # Windows-native toolchains diff --git a/configs/freedom-kl25z/scripts/ld.script b/configs/freedom-kl25z/scripts/freedom-kl25z.ld similarity index 97% rename from configs/freedom-kl25z/scripts/ld.script rename to configs/freedom-kl25z/scripts/freedom-kl25z.ld index 3e1b876b595..e57a2f0496c 100644 --- a/configs/freedom-kl25z/scripts/ld.script +++ b/configs/freedom-kl25z/scripts/freedom-kl25z.ld @@ -1,7 +1,7 @@ /**************************************************************************** - * configs/kwikstik-k40/scripts/ld.script + * configs/kwikstik-k40/scripts/freedom-kl25z.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/freedom-kl25z/nsh/Make.defs b/configs/freedom-kl26z/scripts/Make.defs similarity index 97% rename from configs/freedom-kl25z/nsh/Make.defs rename to configs/freedom-kl26z/scripts/Make.defs index 4eb098fbe9b..41e31e5f617 100644 --- a/configs/freedom-kl25z/nsh/Make.defs +++ b/configs/freedom-kl26z/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/freedom-kl25z/nsh/Make.defs +# configs/freedom-kl26z/scripts/Make.defs # -# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # 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 = freedom-kl26z.ld ifeq ($(WINTOOL),y) # Windows-native toolchains diff --git a/configs/freedom-kl26z/scripts/ld.script b/configs/freedom-kl26z/scripts/freedom-kl26z.ld similarity index 97% rename from configs/freedom-kl26z/scripts/ld.script rename to configs/freedom-kl26z/scripts/freedom-kl26z.ld index 694bc1e2ba8..2ba35c9b448 100644 --- a/configs/freedom-kl26z/scripts/ld.script +++ b/configs/freedom-kl26z/scripts/freedom-kl26z.ld @@ -1,7 +1,7 @@ /**************************************************************************** - * configs/freedom-kl26z/scripts/ld.script + * configs/freedom-kl26z/scripts/freedom-kl26z.ld * - * Copyright (C) 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/configs/kwikstik-k40/ostest/Make.defs b/configs/kwikstik-k40/scripts/Make.defs similarity index 96% rename from configs/kwikstik-k40/ostest/Make.defs rename to configs/kwikstik-k40/scripts/Make.defs index c1e82ed935e..6f30a5eb453 100644 --- a/configs/kwikstik-k40/ostest/Make.defs +++ b/configs/kwikstik-k40/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/kwikstik-k40/ostest/Make.defs +# configs/kwikstik-k40/scripts/Make.defs # -# 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 @@ -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/kwikstik-k40.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/kwikstik-k40.ld endif CC = $(CROSSDEV)gcc diff --git a/configs/kwikstik-k40/scripts/ld.script b/configs/kwikstik-k40/scripts/kwikstik-k40.ld similarity index 97% rename from configs/kwikstik-k40/scripts/ld.script rename to configs/kwikstik-k40/scripts/kwikstik-k40.ld index bcd32829998..7bc0e55b301 100644 --- a/configs/kwikstik-k40/scripts/ld.script +++ b/configs/kwikstik-k40/scripts/kwikstik-k40.ld @@ -1,7 +1,7 @@ /**************************************************************************** - * configs/kwikstik-k40/scripts/ld.script + * configs/kwikstik-k40/scripts/kwikstik-k40.ld * - * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved. + * Copyright (C) 2011, 2015, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/configs/launchxl-tms57004/nsh/Make.defs b/configs/launchxl-tms57004/scripts/Make.defs similarity index 97% rename from configs/launchxl-tms57004/nsh/Make.defs rename to configs/launchxl-tms57004/scripts/Make.defs index fffb827e255..822111503e2 100644 --- a/configs/launchxl-tms57004/nsh/Make.defs +++ b/configs/launchxl-tms57004/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/launchxl-tms57004/nsh/Make.defs +# configs/launchxl-tms57004/scripts/Make.defs # -# Copyright (C) 2015 Gregory Nutt. All rights reserved. +# Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without diff --git a/configs/lm4f120-launchpad/nsh/Make.defs b/configs/lm3s6432-s2e/scripts/Make.defs similarity index 96% rename from configs/lm4f120-launchpad/nsh/Make.defs rename to configs/lm3s6432-s2e/scripts/Make.defs index de827838bdc..e5bda4b40e7 100644 --- a/configs/lm4f120-launchpad/nsh/Make.defs +++ b/configs/lm3s6432-s2e/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/lm4f120-launchpad/nsh/Make.defs +# configs/lm3s6432-s2e/scripts/Make.defs # -# Copyright (C) 2010 Gregory Nutt. All rights reserved. +# Copyright (C) 2010, 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/lm3s6432-s2e.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/lm3s6432-s2e.ld endif CC = $(CROSSDEV)gcc diff --git a/configs/lm3s6432-s2e/scripts/ld.script b/configs/lm3s6432-s2e/scripts/lm3s6432-s2e.ld similarity index 96% rename from configs/lm3s6432-s2e/scripts/ld.script rename to configs/lm3s6432-s2e/scripts/lm3s6432-s2e.ld index 555eb77ba9e..1c848616aa1 100644 --- a/configs/lm3s6432-s2e/scripts/ld.script +++ b/configs/lm3s6432-s2e/scripts/lm3s6432-s2e.ld @@ -1,7 +1,7 @@ /**************************************************************************** - * configs/lm3s6432-s2e/scripts/ld.script + * configs/lm3s6432-s2e/scripts/lm3s6432-s2e.ld * - * Copyright (C) 2010 Gregory Nutt. All rights reserved. + * Copyright (C) 2010, 2017 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/configs/lm3s6432-s2e/nsh/Make.defs b/configs/lm4f120-launchpad/scripts/Make.defs similarity index 96% rename from configs/lm3s6432-s2e/nsh/Make.defs rename to configs/lm4f120-launchpad/scripts/Make.defs index 09536ab68dd..207678b79e9 100644 --- a/configs/lm3s6432-s2e/nsh/Make.defs +++ b/configs/lm4f120-launchpad/scripts/Make.defs @@ -1,7 +1,7 @@ ############################################################################ -# configs/lm3s6432-s2e/nsh/Make.defs +# configs/lm4f120-launchpad/scripts/Make.defs # -# Copyright (C) 2010 Gregory Nutt. All rights reserved. +# Copyright (C) 2010, 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/lm4f120-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/lm4f120-launchpad.ld endif CC = $(CROSSDEV)gcc diff --git a/configs/lm4f120-launchpad/scripts/ld.script b/configs/lm4f120-launchpad/scripts/lm4f120-launchpad.ld similarity index 96% rename from configs/lm4f120-launchpad/scripts/ld.script rename to configs/lm4f120-launchpad/scripts/lm4f120-launchpad.ld index 41b880e0a70..c6df1ca1a46 100644 --- a/configs/lm4f120-launchpad/scripts/ld.script +++ b/configs/lm4f120-launchpad/scripts/lm4f120-launchpad.ld @@ -1,7 +1,7 @@ /**************************************************************************** - * configs/lm4f120-launchpad/scripts/ld.script + * configs/lm4f120-launchpad/scripts/lm4f120-launchpad.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