diff --git a/configs/arduino-mega2560/README.txt b/configs/arduino-mega2560/README.txt index 3ea5ddd30d..229177b4cd 100644 --- a/configs/arduino-mega2560/README.txt +++ b/configs/arduino-mega2560/README.txt @@ -20,19 +20,3 @@ Toolchain tool-chain but specify path to the Atmel AVR8 in path. See arduino-mega2560/hello for example. -MEMX -^^^^ - - If you use the GCC AVR toolchain from the Atmel Studio, then you can - enable suppport for the MEMX storage: - - CONFIG_AVR_HAS_MEMX_PTR=y - - If this support is enabled, then all strings will be saved in FLASH and - standard string-oriented interfaces such printf() will change so that - they accept memx pointers. - - This means that (1) ALL strings must lie in FLASH, and (2) since the - strings are moved from SRAM to FLASH, you will save a LOT of SRAM usage - in some configurations that use a lot of string memory (such as the - ostest and nsh configurations). diff --git a/configs/arduino-mega2560/hello/Make.defs b/configs/arduino-mega2560/hello/Make.defs index 9bf07fd6bf..87ee02f1bc 100644 --- a/configs/arduino-mega2560/hello/Make.defs +++ b/configs/arduino-mega2560/hello/Make.defs @@ -37,11 +37,7 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs -ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y) - LDSCRIPT = memx.ld -else - LDSCRIPT = nomemx.ld -endif +LDSCRIPT = flash.ld ifeq ($(WINTOOL),y) # Windows-native toolchains @@ -78,12 +74,6 @@ endif ARCHCFLAGS = -fno-builtin ARCHCXXFLAGS = -fno-builtin -fno-exceptions - -ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y) - ARCHCFLAGS += -fdata-sections - ARCHCXXFLAGS += -fdata-sections -endif - ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHWARNINGSXX = -Wall -Wshadow -Wundef ARCHDEFINES = diff --git a/configs/arduino-mega2560/ostest/Make.defs b/configs/arduino-mega2560/ostest/Make.defs index abde167ffb..64adce57eb 100644 --- a/configs/arduino-mega2560/ostest/Make.defs +++ b/configs/arduino-mega2560/ostest/Make.defs @@ -37,11 +37,7 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs -ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y) - LDSCRIPT = memx.ld -else - LDSCRIPT = nomemx.ld -endif +LDSCRIPT = flash.ld ifeq ($(WINTOOL),y) # Windows-native toolchains @@ -78,12 +74,6 @@ endif ARCHCFLAGS = -fno-builtin ARCHCXXFLAGS = -fno-builtin -fno-exceptions - -ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y) - ARCHCFLAGS += -fdata-sections - ARCHCXXFLAGS += -fdata-sections -endif - ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHWARNINGSXX = -Wall -Wshadow -Wundef ARCHDEFINES = diff --git a/configs/arduino-mega2560/scripts/nomemx.ld b/configs/arduino-mega2560/scripts/flash.ld similarity index 99% rename from configs/arduino-mega2560/scripts/nomemx.ld rename to configs/arduino-mega2560/scripts/flash.ld index 8f1bee3756..811a771dd9 100644 --- a/configs/arduino-mega2560/scripts/nomemx.ld +++ b/configs/arduino-mega2560/scripts/flash.ld @@ -1,5 +1,5 @@ /******************************************************************************* - * configs/arduino-mega2560/scripts/nomemx.ld + * configs/arduino-mega2560/scripts/flash.ld * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/arduino-mega2560/scripts/memx.ld b/configs/arduino-mega2560/scripts/memx.ld deleted file mode 100644 index 6dec47f11b..0000000000 --- a/configs/arduino-mega2560/scripts/memx.ld +++ /dev/null @@ -1,214 +0,0 @@ -/******************************************************************************* - * configs/arduino-memga2560/scripts/memx.ld - * - * Copyright (C) 2015 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. - * - ******************************************************************************/ - -/* Memory Regions *************************************************************/ -/* ------ ------ ------+------- -- ------ -- ------ --- ------ ----+------- --- - * FLASH | REGISTERS I/O EXT I/O ISRAM | EEPROM - * | REGISTERS REGISTERS | - * ------- ------ -----+------- -- ------ -- ------ --- ------ ----+------- --- - * 0x0000 256Kb| 0x0000 32 0x0020 64 0x0060 416 0x0200 8Kb | 0x0000 4Kb - * ------- ------ -----+------- -- ------ -- ------ --- ------ ----+------- --- - * *Memory configuration A - */ - -MEMORY -{ - flash (rx) : ORIGIN = 0, LENGTH = 256K - sram (rw!x) : ORIGIN = 0x800200, LENGTH = 8K - eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 4K -} - -OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr") -OUTPUT_ARCH(avr:6) -ENTRY(__start) - -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - - .rel.text : - { - *(.rel.text) - *(.rel.text.*) - *(.rel.gnu.linkonce.t*) - } - - .rela.text : - { - *(.rela.text) - *(.rela.text.*) - *(.rela.gnu.linkonce.t*) - } - - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - - .rel.rodata : - { - *(.rel.rodata) - *(.rel.rodata.*) - *(.rel.gnu.linkonce.r*) - } - - .rela.rodata : - { - *(.rela.rodata) - *(.rela.rodata.*) - *(.rela.gnu.linkonce.r*) - } - - .rel.data : - { - *(.rel.data) - *(.rel.data.*) - *(.rel.gnu.linkonce.d*) - } - - .rela.data : - { - *(.rela.data) - *(.rela.data.*) - *(.rela.gnu.linkonce.d*) - } - - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - - .text : - { - _stext = . ; - *(.vectors) - *(.init) - *(.handlers) - *(.progmem .progmem.*) - *(.rodata.str1.*) - *(.text) - *(.text.*) - _etext = . ; - } > flash - - _eronly = ABSOLUTE(.); - - .data : - { - _sdata = ABSOLUTE(.); - *(.rodata .rodata.*) - *(.data .data.*) - *(.gnu.linkonce.d.*) - CONSTRUCTORS - _edata = ABSOLUTE(.); - } > sram AT > flash - - .bss : - { - _sbss = ABSOLUTE(.); - *(.bss .bss.*) - *(.gnu.linkonce.b.*) - *(COMMON) - _ebss = ABSOLUTE(.); - } > sram - - /* Global data not cleared after reset. */ - - .noinit : - { - _snoinit = ABSOLUTE(.); - *(.noinit*) - _enoinit = ABSOLUTE(.); - } > sram - - .eeprom : - { - _seeprom = ABSOLUTE(.); - *(.eeprom*) - _eeeprom = ABSOLUTE(.); - } > eeprom - - /* 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) } - - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - - /* DWARF 1 */ - - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - - /* GNU DWARF 1 extensions */ - - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - - /* DWARF 1.1 and DWARF 2 */ - - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - - /* DWARF 2 */ - - .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } -} diff --git a/configs/teensy-2.0/README.txt b/configs/teensy-2.0/README.txt index 049a3c653a..d479db4125 100644 --- a/configs/teensy-2.0/README.txt +++ b/configs/teensy-2.0/README.txt @@ -17,7 +17,6 @@ Contents o Windows Native Toolchains o NuttX buildroot Toolchain o avr-libc - o MEMX o Teensy++ Configuration Options o Configurations @@ -394,33 +393,6 @@ Build Notes: make install -MEMX -^^^^ - - If you use the GCC AVR toolchain from the Atmel Studio, then you can - enable suppport for the MEMX storage: - - CONFIG_AVR_HAS_MEMX_PTR=y - - If this support is enabled, then all strings will be saved in FLASH and - standard string-oriented interfaces such printf() will change so that - they accept memx pointers. - - This means that (1) ALL strings must lie in FLASH, and (2) since the - strings are moved from SRAM to FLASH, you will save a LOT of SRAM usage - in some configurations that use a lot of string memory (such as the - ostest and nsh configurations). - - UPDATE 2016-01-07: Unfortunately, there is an issue. When I enable - CONFIG_AVR_HAS_MEMX_PTR=y in the nsh/ configuration, I get a number - of link time errors of this form: - - FILENAME.c:(.text+0xOFFSET): warning: internal error: out of range error - - This same build configuration works for the arduino-mega2560 so I am - suspecting some issue with the toolchain support for the AT90USB (avr:5) - vs the Atmega2560 (avr:6). - Teensy++ Configuration Options ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/configs/teensy-2.0/hello/Make.defs b/configs/teensy-2.0/hello/Make.defs index 39eb84c604..85b6f15694 100644 --- a/configs/teensy-2.0/hello/Make.defs +++ b/configs/teensy-2.0/hello/Make.defs @@ -37,11 +37,7 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs -ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y) - LDSCRIPT = memx.ld -else - LDSCRIPT = nomemx.ld -endif +LDSCRIPT = flash.ld ifeq ($(WINTOOL),y) # Windows-native toolchains @@ -78,12 +74,6 @@ endif ARCHCFLAGS = -fno-builtin ARCHCXXFLAGS = -fno-builtin -fno-exceptions - -ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y) - ARCHCFLAGS += -fdata-sections - ARCHCXXFLAGS += -fdata-sections -endif - ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHWARNINGSXX = -Wall -Wshadow -Wundef ARCHDEFINES = diff --git a/configs/teensy-2.0/nsh/Make.defs b/configs/teensy-2.0/nsh/Make.defs index c274869e28..6e26387824 100644 --- a/configs/teensy-2.0/nsh/Make.defs +++ b/configs/teensy-2.0/nsh/Make.defs @@ -37,11 +37,7 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs -ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y) - LDSCRIPT = memx.ld -else - LDSCRIPT = nomemx.ld -endif +LDSCRIPT = flash.ld ifeq ($(WINTOOL),y) # Windows-native toolchains @@ -78,12 +74,6 @@ endif ARCHCFLAGS = -fno-builtin ARCHCXXFLAGS = -fno-builtin -fno-exceptions - -ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y) - ARCHCFLAGS += -fdata-sections - ARCHCXXFLAGS += -fdata-sections -endif - ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHWARNINGSXX = -Wall -Wshadow -Wundef ARCHDEFINES = diff --git a/configs/teensy-2.0/scripts/nomemx.ld b/configs/teensy-2.0/scripts/flash.ld similarity index 99% rename from configs/teensy-2.0/scripts/nomemx.ld rename to configs/teensy-2.0/scripts/flash.ld index 6b4709d4a6..c6d5cac3e8 100644 --- a/configs/teensy-2.0/scripts/nomemx.ld +++ b/configs/teensy-2.0/scripts/flash.ld @@ -1,5 +1,5 @@ /************************************************************************************ - * configs/teensy-2.0/scripts/nomemx.ld + * configs/teensy-2.0/scripts/flash.ld * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/configs/teensy-2.0/scripts/memx.ld b/configs/teensy-2.0/scripts/memx.ld deleted file mode 100644 index 60262b3743..0000000000 --- a/configs/teensy-2.0/scripts/memx.ld +++ /dev/null @@ -1,213 +0,0 @@ -/************************************************************************************ - * configs/teensy-2.0/scripts/memx.ld - * - * Copyright (C) 2015 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. - * - ************************************************************************************/ - -/* Memory Regions *******************************************************************/ -/* ------------ ------ ------+------- -- ------ -- ------ --- ------ ----+------- --- - * FLASH | REGISTERS I/O EXT I/O ISRAM | EEPROM - * | REGISTERS REGISTERS | - * ------------ ------ ------+------- -- ------ -- ------ --- ------ ----+------- --- - * AT90USB1286 0x0000 128Kb | 0x0000 32 0x0020 64 0x0060 160 0x0100 8Kb | 0x0000 4Kb - * ------------ ------ ------+------- -- ------ -- ------ --- ------ ----+------- --- - */ - -MEMORY -{ - flash (rx) : ORIGIN = 0, LENGTH = 128K - sram (rw!x) : ORIGIN = 0x800100, LENGTH = 8K - eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 4K -} - -OUTPUT_FORMAT("elf32-avr","elf32-avr","elf32-avr") -OUTPUT_ARCH(avr:5) -ENTRY(__start) - -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rel.init : { *(.rel.init) } - .rela.init : { *(.rela.init) } - - .rel.text : - { - *(.rel.text) - *(.rel.text.*) - *(.rel.gnu.linkonce.t*) - } - - .rela.text : - { - *(.rela.text) - *(.rela.text.*) - *(.rela.gnu.linkonce.t*) - } - - .rel.fini : { *(.rel.fini) } - .rela.fini : { *(.rela.fini) } - - .rel.rodata : - { - *(.rel.rodata) - *(.rel.rodata.*) - *(.rel.gnu.linkonce.r*) - } - - .rela.rodata : - { - *(.rela.rodata) - *(.rela.rodata.*) - *(.rela.gnu.linkonce.r*) - } - - .rel.data : - { - *(.rel.data) - *(.rel.data.*) - *(.rel.gnu.linkonce.d*) - } - - .rela.data : - { - *(.rela.data) - *(.rela.data.*) - *(.rela.gnu.linkonce.d*) - } - - .rel.ctors : { *(.rel.ctors) } - .rela.ctors : { *(.rela.ctors) } - .rel.dtors : { *(.rel.dtors) } - .rela.dtors : { *(.rela.dtors) } - .rel.got : { *(.rel.got) } - .rela.got : { *(.rela.got) } - .rel.bss : { *(.rel.bss) } - .rela.bss : { *(.rela.bss) } - .rel.plt : { *(.rel.plt) } - .rela.plt : { *(.rela.plt) } - - .text : - { - _stext = . ; - *(.vectors) - *(.init) - *(.handlers) - *(.progmem .progmem.*) - *(.rodata.str1.*) - *(.text) - *(.text.*) - _etext = . ; - } > flash - - _eronly = ABSOLUTE(.); - - .data : - { - _sdata = ABSOLUTE(.); - *(.rodata .rodata.*) - *(.data .data.*) - *(.gnu.linkonce.d.*) - CONSTRUCTORS - _edata = ABSOLUTE(.); - } > sram AT > flash - - .bss : - { - _sbss = ABSOLUTE(.); - *(.bss .bss.*) - *(.gnu.linkonce.b.*) - *(COMMON) - _ebss = ABSOLUTE(.); - } > sram - - /* Global data not cleared after reset. */ - - .noinit : - { - _snoinit = ABSOLUTE(.); - *(.noinit*) - _enoinit = ABSOLUTE(.); - } > sram - - .eeprom : - { - _seeprom = ABSOLUTE(.); - *(.eeprom*) - _eeeprom = ABSOLUTE(.); - } > eeprom - - /* 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) } - - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - - /* DWARF 1 */ - - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - - /* GNU DWARF 1 extensions */ - - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - - /* DWARF 1.1 and DWARF 2 */ - - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - - /* DWARF 2 */ - - .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } -} diff --git a/configs/teensy-2.0/usbmsc/Make.defs b/configs/teensy-2.0/usbmsc/Make.defs index 0fe2f13c32..23b398aef2 100644 --- a/configs/teensy-2.0/usbmsc/Make.defs +++ b/configs/teensy-2.0/usbmsc/Make.defs @@ -37,11 +37,7 @@ include ${TOPDIR}/.config include ${TOPDIR}/tools/Config.mk include ${TOPDIR}/arch/avr/src/avr/Toolchain.defs -ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y) - LDSCRIPT = memx.ld -else - LDSCRIPT = nomemx.ld -endif +LDSCRIPT = flash.ld ifeq ($(WINTOOL),y) # Windows-native toolchains @@ -78,12 +74,6 @@ endif ARCHCFLAGS = -fno-builtin ARCHCXXFLAGS = -fno-builtin -fno-exceptions - -ifeq ($(CONFIG_AVR_HAS_MEMX_PTR),y) - ARCHCFLAGS += -fdata-sections - ARCHCXXFLAGS += -fdata-sections -endif - ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHWARNINGSXX = -Wall -Wshadow -Wundef ARCHDEFINES =