diff --git a/boards/arm/imx6/sabre-6quad/scripts/gnu-elf.ld b/boards/arm/imx6/sabre-6quad/scripts/gnu-elf.ld new file mode 100644 index 00000000000..7d0f31513aa --- /dev/null +++ b/boards/arm/imx6/sabre-6quad/scripts/gnu-elf.ld @@ -0,0 +1,139 @@ +/**************************************************************************** + * boards/arm/imx6/sabre-6quad/scripts/gnu-elf.ld + * + * 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. + * + ****************************************************************************/ + +SECTIONS +{ + .text 0x00000000 : + { + _stext = . ; + *(.text) + *(.text.*) + *(.gnu.warning) + *(.stub) + *(.glue_7) + *(.glue_7t) + *(.jcr) + + /* C++ support: The .init and .fini sections contain specific logic + * to manage static constructors and destructors. + */ + + *(.gnu.linkonce.t.*) + *(.init) /* Old ABI */ + *(.fini) /* Old ABI */ + _etext = . ; + } + + .ARM.extab : + { + *(.ARM.extab*) + } + + .ARM.exidx : + { + *(.ARM.exidx*) + } + + .rodata : + { + _srodata = . ; + *(.rodata) + *(.rodata1) + *(.rodata.*) + *(.gnu.linkonce.r*) + _erodata = . ; + } + + .data : + { + _sdata = . ; + *(.data) + *(.data1) + *(.data.*) + *(.gnu.linkonce.d*) + _edata = . ; + } + + /* C++ support. For each global and static local C++ object, + * GCC creates a small subroutine to construct the object. Pointers + * to these routines (not the routines themselves) are stored as + * simple, linear arrays in the .ctors section of the object file. + * Similarly, pointers to global/static destructor routines are + * stored in .dtors. + */ + + .ctors : + { + _sctors = . ; + *(.ctors) /* Old ABI: Unallocated */ + *(.init_array) /* New ABI: Allocated */ + _edtors = . ; + } + + .dtors : + { + _sdtors = . ; + *(.dtors) /* Old ABI: Unallocated */ + *(.fini_array) /* New ABI: Allocated */ + _edtors = . ; + } + + .bss : + { + _sbss = . ; + *(.bss) + *(.bss.*) + *(.sbss) + *(.sbss.*) + *(.gnu.linkonce.b*) + *(COMMON) + _ebss = . ; + } + + /* 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/boards/arm/imxrt/imxrt1050-evk/configs/knsh/Make.defs b/boards/arm/imxrt/imxrt1050-evk/configs/knsh/Make.defs index 19b56436de2..573824730f7 100644 --- a/boards/arm/imxrt/imxrt1050-evk/configs/knsh/Make.defs +++ b/boards/arm/imxrt/imxrt1050-evk/configs/knsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/imxrt1050-evk/configs/knsh/Make.defs +# boards/arm/imxrt/imxrt1050-evk/configs/knsh/Make.defs # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/Make.defs b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/Make.defs index 7f0de542925..b2c6073c31c 100644 --- a/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/Make.defs +++ b/boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/imxrt1050-evk/configs/libcxxtest/Make.defs +# boards/arm/imxrt/imxrt1050-evk/configs/libcxxtest/Make.defs # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs b/boards/arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs index 8030b6aa0cb..0fb99a2b44d 100644 --- a/boards/arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs +++ b/boards/arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/imxrt1060-evk/configs/knsh/Make.defs +# boards/arm/imxrt/imxrt1060-evk/configs/knsh/Make.defs # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs index 7c191b2d3dc..6fea9fca3ff 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs +++ b/boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/lpc4088-devkit/configs/knsh/Make.defs +# boards/arm/lpc17xx_40xx/lpc4088-devkit/configs/knsh/Make.defs # # Copyright (C) 2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs index 9d6038a8de0..5d1b914da06 100644 --- a/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs +++ b/boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/lpc4088-quickstart/configs/knsh/Make.defs +# boards/arm/lpc17xx_40xx/lpc4088-quickstart/configs/knsh/Make.defs # # Copyright (C) 2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/Make.defs b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/Make.defs index f0e7e00c4ac..a18f47bfd8d 100644 --- a/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/Make.defs +++ b/boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/lpcxpresso-lpc1768/configs/thttpd/Make.defs +# boards/arm/lpc17xx_40xx/lpcxpresso-lpc1768/configs/thttpd/Make.defs # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/README.txt b/boards/arm/lpc17xx_40xx/lx_cpu/README.txt index 11924a59acd..b79b4681740 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/README.txt +++ b/boards/arm/lpc17xx_40xx/lx_cpu/README.txt @@ -100,7 +100,7 @@ Using OpenOCD with the Olimex ARM-USB-OCD Building OpenOCD under Cygwin: - Refer to configs/olimex-lpc1766stk/README.txt + Refer to boards/arm/lpc17xx_40xx/olimex-lpc1766stk/README.txt Installing OpenOCD in Ubuntu Linux: diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/scripts/gnu-elf.ld b/boards/arm/lpc17xx_40xx/lx_cpu/scripts/gnu-elf.ld index 2e9357ec495..4b729ffa8d3 100644 --- a/boards/arm/lpc17xx_40xx/lx_cpu/scripts/gnu-elf.ld +++ b/boards/arm/lpc17xx_40xx/lx_cpu/scripts/gnu-elf.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/stm32f4discovery/scripts/gnu-elf.ld + * boards/arm/lcp17xx_40xx/lx_cpu/scripts/gnu-elf.ld * * Copyright (C) 2012 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs index ca26eedb841..55ab789470f 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs +# boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-binfs/Make.defs # # Copyright (C) 2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs index c4959a152c2..55923cd4215 100644 --- a/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs +++ b/boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs +# boards/arm/lpc17xx_40xx/olimex-lpc1766stk/configs/thttpd-nxflat/Make.defs # # Copyright (C) 2010, 2012, 2015 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs index 93a5e22be89..407d3962904 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs +++ b/boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/open1788/configs/knsh/Make.defs +# boards/arm/lpc17xx_40xx/open1788/configs/knsh/Make.defs # # Copyright (C) 2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs index 29f41d547f5..e9f49b38d53 100644 --- a/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs +++ b/boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/open1788/configs/knxterm/Make.defs +# boards/arm/lpc17xx_40xx/open1788/configs/knxterm/Make.defs # # Copyright (C) 2019 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs b/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs index 5c4d1c6d4d5..f254c069ae1 100644 --- a/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs +++ b/boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/pnev5180b/configs/knsh/Make.defs +# boards/arm/lpc17xx_40xx/pnev5180b/configs/knsh/Make.defs # # Copyright (C) 2019 Gregory Nutt. All rights reserved. # Author: Michael Jung diff --git a/boards/arm/lpc31xx/ea3131/configs/pgnsh/Make.defs b/boards/arm/lpc31xx/ea3131/configs/pgnsh/Make.defs index 783c8a1d9d5..a4bb33edd53 100644 --- a/boards/arm/lpc31xx/ea3131/configs/pgnsh/Make.defs +++ b/boards/arm/lpc31xx/ea3131/configs/pgnsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/ea3131/configs/pgnsh/Make.defs +# boards/arm/lpc31xx/ea3131/configs/pgnsh/Make.defs # # Copyright (C) 2010,2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/lpc43xx/bambino-200e/README.txt b/boards/arm/lpc43xx/bambino-200e/README.txt index f836311100c..9e6c283c0b4 100644 --- a/boards/arm/lpc43xx/bambino-200e/README.txt +++ b/boards/arm/lpc43xx/bambino-200e/README.txt @@ -127,7 +127,7 @@ Configuration Changes --------------------- Below are all of the configuration changes that I had to make to -boards/stm3240g-eval/configs/nsh2 in order to successfully build NuttX using +boards/arm/stm32/stm3240g-eval/configs/nsh2 in order to successfully build NuttX using the Atollic toolchain WITH FPU support: -CONFIG_ARCH_FPU=n : Enable FPU support diff --git a/boards/arm/lpc43xx/bambino-200e/configs/netnsh/Make.defs b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/Make.defs index 484e6cd1d0d..94cbf030eb3 100644 --- a/boards/arm/lpc43xx/bambino-200e/configs/netnsh/Make.defs +++ b/boards/arm/lpc43xx/bambino-200e/configs/netnsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/bambino-200e/configs/nsh/Make.defs +# boards/arm/lpc17xx_40xx/bambino-200e/configs/nsh/Make.defs # # Copyright (C) 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs b/boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs index e0a1dfaf306..d2a38bfb6b8 100644 --- a/boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs +++ b/boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/sam3u-ek/configs/knsh/Make.defs +# boards/arm/sam34/sam3u-ek/configs/knsh/Make.defs # # Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs b/boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs index 9d4f30df134..02ac9270f78 100644 --- a/boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs +++ b/boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/sama5d4-ek/configs/knsh/Make.defs +# boards/arm/sama5/sama5d4-ek/configs/knsh/Make.defs # # Copyright (C) 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/samv7/samv71-xult/configs/knsh/Make.defs b/boards/arm/samv7/samv71-xult/configs/knsh/Make.defs index bbe2397ee51..950fab41978 100644 --- a/boards/arm/samv7/samv71-xult/configs/knsh/Make.defs +++ b/boards/arm/samv7/samv71-xult/configs/knsh/Make.defs @@ -1,6 +1,5 @@ - ############################################################################ -# boards/samv71-xult/configs/knsh/Make.defs +# boards/arm/samv7/samv71-xult/configs/knsh/Make.defs # # Copyright (C) 2015, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/stm32/axoloti/scripts/Make.defs b/boards/arm/stm32/axoloti/scripts/Make.defs index 4e2395c443e..39d544528fb 100644 --- a/boards/arm/stm32/axoloti/scripts/Make.defs +++ b/boards/arm/stm32/axoloti/scripts/Make.defs @@ -112,9 +112,9 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs index c32d6547418..64c17736bb4 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs +++ b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/olimex-stm32-p407/configs/kelf/Make.defs +# boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs index a2986987ea4..97a2b8478c9 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs +++ b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/olimex-stm32-p407/configs/kmodule/Make.defs +# boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/Make.defs b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/Make.defs index 284db67a9e8..24adbdb790d 100644 --- a/boards/arm/stm32/olimex-stm32-p407/configs/knsh/Make.defs +++ b/boards/arm/stm32/olimex-stm32-p407/configs/knsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/olimex-stm32-p407/configs/knsh/Make.defs +# boards/arm/stm32/olimex-stm32-p407/configs/knsh/Make.defs # # Copyright (C) 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/stm32/stm3240g-eval/configs/knxwm/Make.defs b/boards/arm/stm32/stm3240g-eval/configs/knxwm/Make.defs index a893a64d75b..334269b5e1b 100644 --- a/boards/arm/stm32/stm3240g-eval/configs/knxwm/Make.defs +++ b/boards/arm/stm32/stm3240g-eval/configs/knxwm/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/stm3240g-eval/configs/knxwm/Make.defs +# boards/arm/stm32/stm3240g-eval/configs/knxwm/Make.defs # # Copyright (C) 2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/stm32/stm32f4discovery/configs/cxxtest/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/Make.defs index 7cbb00d59ef..4d366e0e0ba 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/cxxtest/Make.defs +++ b/boards/arm/stm32/stm32f4discovery/configs/cxxtest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/stm32f4discovery/configs/cxxtest/Make.defs +# boards/arm/stm32/stm32f4discovery/configs/cxxtest/Make.defs # # Copyright (C) 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/stm32/stm32f4discovery/configs/elf/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/elf/Make.defs index 465551281ef..b0277573f4d 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/elf/Make.defs +++ b/boards/arm/stm32/stm32f4discovery/configs/elf/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/stm32f4discovery/configs/elf/Make.defs +# boards/arm/stm32/stm32f4discovery/configs/elf/Make.defs # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/Make.defs index de62c1dd478..ff875855601 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/Make.defs +++ b/boards/arm/stm32/stm32f4discovery/configs/posix_spawn/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/stm32f4discovery/configs/posix_spawn/Make.defs +# boards/arm/stm32/stm32f4discovery/configs/posix_spawn/Make.defs # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/Make.defs index b3fadc4e85b..bab9a4d03d4 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/Make.defs +++ b/boards/arm/stm32/stm32f4discovery/configs/testlibcxx/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/stm32f4discovery/configs/testlibcxx/Make.defs +# boards/arm/stm32/stm32f4discovery/configs/testlibcxx/Make.defs # # Copyright (C) 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/stm32/stm32f4discovery/configs/winbuild/Make.defs b/boards/arm/stm32/stm32f4discovery/configs/winbuild/Make.defs index 767a87ad0c4..a53b390435b 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/winbuild/Make.defs +++ b/boards/arm/stm32/stm32f4discovery/configs/winbuild/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/stm32f4discovery/configs/winbuild/Make.defs +# boards/arm/stm32/stm32f4discovery/configs/winbuild/Make.defs # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/Make.defs index 3f983a32473..b0df2d042c6 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/Make.defs +++ b/boards/arm/stm32f7/nucleo-144/configs/f722-nsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/nucleo-144/configs/f722-nsh/Make.defs +# boards/arm-stm32f7/nucleo-144/configs/f722-nsh/Make.defs # # Copyright (C) 2017 Gregory Nutt. All rights reserved. # Authors: Gregory Nutt diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs index 447af4746a7..c3709489aa9 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs +++ b/boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/nucleo-144/configs/f746-evalos/Make.defs +# boards/arm/stm32f7/nucleo-144/configs/f746-evalos/Make.defs # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Authors: Gregory Nutt diff --git a/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs index e48134958d4..c2dc9623e7e 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs +++ b/boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/nucleo-144/configs/f746-nsh/Make.defs +# boards/arm/stm32f7/nucleo-144/configs/f746-nsh/Make.defs # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Authors: Gregory Nutt diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs index 1571ad34e6f..6f96df1aa42 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs +++ b/boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/nucleo-144/configs/f767-evalos/Make.defs +# boards/arm/stm32f7/nucleo-144/configs/f767-evalos/Make.defs # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Authors: Gregory Nutt diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs index a8372a62e61..6de176e2f68 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs +++ b/boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/nucleo-144/configs/f767-netnsh/Make.defs +# boards/arm/stm32f7/nucleo-144/configs/f767-netnsh/Make.defs # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Authors: Gregory Nutt diff --git a/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs b/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs index fffed89336c..2d4670956fc 100644 --- a/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs +++ b/boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/nucleo-144/configs/f767-nsh/Make.defs +# boards/arm/stm32f7/nucleo-144/configs/f767-nsh/Make.defs # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Authors: Gregory Nutt diff --git a/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/Make.defs b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/Make.defs index f8133496010..af615606935 100644 --- a/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/Make.defs +++ b/boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/stm32l476vg-disco/configs/knsh/Make.defs +# boards/arm/stm32l4/stm32l476vg-disco/configs/knsh/Make.defs # # Copyright (C) 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/Make.defs b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/Make.defs index 44de47eca2b..013755f5321 100644 --- a/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/Make.defs +++ b/boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/stm32l4r9ai-disco/configs/knsh/Make.defs +# boards/arm/stm32l4/stm32l4r9ai-disco/configs/knsh/Make.defs # # Copyright (C) 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/avr/atmega/amber/scripts/Make.defs b/boards/avr/atmega/amber/scripts/Make.defs index 7ebde03ebcd..5ec55d1adad 100644 --- a/boards/avr/atmega/amber/scripts/Make.defs +++ b/boards/avr/atmega/amber/scripts/Make.defs @@ -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)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/amber.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/amber.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)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_BOARD)/scripts/amber.ld + ARCHSCRIPT = -T$(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/amber.ld endif CC = $(CROSSDEV)gcc diff --git a/boards/avr/atmega/amber/scripts/gnu-elf.ld b/boards/avr/atmega/amber/scripts/gnu-elf.ld new file mode 100644 index 00000000000..a008b8a9bef --- /dev/null +++ b/boards/avr/atmega/amber/scripts/gnu-elf.ld @@ -0,0 +1,139 @@ +/**************************************************************************** + * boards/avr/atmega/amber/scripts/gnu-elf.ld + * + * 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. + * + ****************************************************************************/ + +SECTIONS +{ + .text 0x00000000 : + { + _stext = . ; + *(.text) + *(.text.*) + *(.gnu.warning) + *(.stub) + *(.glue_7) + *(.glue_7t) + *(.jcr) + + /* C++ support: The .init and .fini sections contain specific logic + * to manage static constructors and destructors. + */ + + *(.gnu.linkonce.t.*) + *(.init) /* Old ABI */ + *(.fini) /* Old ABI */ + _etext = . ; + } + + .ARM.extab : + { + *(.ARM.extab*) + } + + .ARM.exidx : + { + *(.ARM.exidx*) + } + + .rodata : + { + _srodata = . ; + *(.rodata) + *(.rodata1) + *(.rodata.*) + *(.gnu.linkonce.r*) + _erodata = . ; + } + + .data : + { + _sdata = . ; + *(.data) + *(.data1) + *(.data.*) + *(.gnu.linkonce.d*) + _edata = . ; + } + + /* C++ support. For each global and static local C++ object, + * GCC creates a small subroutine to construct the object. Pointers + * to these routines (not the routines themselves) are stored as + * simple, linear arrays in the .ctors section of the object file. + * Similarly, pointers to global/static destructor routines are + * stored in .dtors. + */ + + .ctors : + { + _sctors = . ; + *(.ctors) /* Old ABI: Unallocated */ + *(.init_array) /* New ABI: Allocated */ + _edtors = . ; + } + + .dtors : + { + _sdtors = . ; + *(.dtors) /* Old ABI: Unallocated */ + *(.fini_array) /* New ABI: Allocated */ + _edtors = . ; + } + + .bss : + { + _sbss = . ; + *(.bss) + *(.bss.*) + *(.sbss) + *(.sbss.*) + *(.gnu.linkonce.b*) + *(COMMON) + _ebss = . ; + } + + /* 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/boards/sim/sim/sim/configs/cxxtest/Make.defs b/boards/sim/sim/sim/configs/cxxtest/Make.defs index aeab0f919e3..01402cd2541 100644 --- a/boards/sim/sim/sim/configs/cxxtest/Make.defs +++ b/boards/sim/sim/sim/configs/cxxtest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/sim/configs/cxxtest/Make.defs +# boards/sim/sim/sim/configs/cxxtest/Make.defs # # Copyright (C) 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -91,9 +91,9 @@ CXXELFFLAGS = $(CXXFLAGS) LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif diff --git a/boards/sim/sim/sim/configs/nsh2/Make.defs b/boards/sim/sim/sim/configs/nsh2/Make.defs index 75493244461..e4460094c28 100644 --- a/boards/sim/sim/sim/configs/nsh2/Make.defs +++ b/boards/sim/sim/sim/configs/nsh2/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/sim/configs/nsh2/Make.defs +# boards/sim/sim/sim/configs/nsh2/Make.defs # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt @@ -87,9 +87,9 @@ CXXELFFLAGS = $(CXXFLAGS) LDELFFLAGS = -r -e main ifeq ($(WINTOOL),y) - LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" + LDELFFLAGS += -T "${shell cygpath -w $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld}" else - LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld + LDELFFLAGS += -T $(TOPDIR)/boards/$(CONFIG_ARCH)/$(CONFIG_ARCH_CHIP)/$(CONFIG_ARCH_BOARD)/scripts/gnu-elf.ld endif diff --git a/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs b/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs index 404d156612a..26ffaaca63b 100644 --- a/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs +++ b/boards/z80/z8/z8encore000zco/configs/ostest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/z8encore000zco/configs/ostest/Make.defs +# boards/z80/z8/z8encore000zco/configs/ostest/Make.defs # # Copyright (C) 2008, 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs b/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs index 534321a15da..e98b0138070 100644 --- a/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs +++ b/boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/z8f64200100kit/configs/ostest/Make.defs +# boards/z80/z8/z8f64200100kit/configs/ostest/Make.defs # # Copyright (C) 2008, 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt