diff --git a/linker/esp32.extram.bss.ld b/linker/esp32.extram.bss.ld deleted file mode 100644 index 582f6eb6e..000000000 --- a/linker/esp32.extram.bss.ld +++ /dev/null @@ -1,18 +0,0 @@ -/* This section is only included if CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY - is set, to link some sections to BSS in PSRAM */ - -SECTIONS -{ - /* external memory bss, from any global variable with EXT_RAM_ATTR attribute*/ - .ext_ram.bss (NOLOAD) : - { - _ext_ram_bss_start = ABSOLUTE(.); - *(.ext_ram.bss*) - *libnet80211.a:(.dynsbss .sbss .sbss.* .gnu.linkonce.sb.* .scommon .sbss2.* .gnu.linkonce.sb2.* .dynbss .bss .bss.* .share.mem .gnu.linkonce.b.* COMMON) - *libpp.a:(.dynsbss .sbss .sbss.* .gnu.linkonce.sb.* .scommon .sbss2.* .gnu.linkonce.sb2.* .dynbss .bss .bss.* .share.mem .gnu.linkonce.b.* COMMON) - *liblwip.a:(.dynsbss .sbss .sbss.* .gnu.linkonce.sb.* .scommon .sbss2.* .gnu.linkonce.sb2.* .dynbss .bss .bss.* .share.mem .gnu.linkonce.b.* COMMON) - *libbt.a:(EXCLUDE_FILE (libbtdm_app.a) .dynsbss .sbss .sbss.* .gnu.linkonce.sb.* .scommon .sbss2.* .gnu.linkonce.sb2.* .dynbss .bss .bss.* .share.mem .gnu.linkonce.b.* COMMON) - . = ALIGN(4); - _ext_ram_bss_end = ABSOLUTE(.); - } > extern_ram_seg -} diff --git a/linker/nrf52840_s140_sim832.ld b/linker/nrf52840_s140_sim832.ld deleted file mode 100644 index 273746683..000000000 --- a/linker/nrf52840_s140_sim832.ld +++ /dev/null @@ -1,46 +0,0 @@ -/* Linker script to configure memory regions. - -geeksville: modified this to simulate a nrf52832 but with a sd140 soft device. So I can -see how the memory footprint works on this lower end CPU. Note: to work with sd140 in my bootloader -I need to start ram at 0x6000 (instead of the correct 0x3600 for sd132) - so I have less -RAM available than on a real 832. -*/ - -SEARCH_DIR(.) -GROUP(-lgcc -lc -lnosys) - -MEMORY -{ - FLASH (rx) : ORIGIN = 0x26000, LENGTH = 0x6D000 - 0x26000 - /* FLASH (rx) : ORIGIN = 0x26000, LENGTH = 0xED000 - 0x26000 */ - - /* SRAM required by S132 depend on - * - Attribute Table Size - * - Vendor UUID count - * - Max ATT MTU - * - Concurrent connection peripheral + central + secure links - * - Event Len, HVN queue, Write CMD queue - */ - /* RAM (rwx) : ORIGIN = 0x20003600, LENGTH = 0x20010000 - 0x20003600 */ - RAM (rwx) : ORIGIN = 0x20006000, LENGTH = 0x20010000 - 0x20006000 -} - -SECTIONS -{ - . = ALIGN(4); - .svc_data : - { - PROVIDE(__start_svc_data = .); - KEEP(*(.svc_data)) - PROVIDE(__stop_svc_data = .); - } > RAM - - .fs_data : - { - PROVIDE(__start_fs_data = .); - KEEP(*(.fs_data)) - PROVIDE(__stop_fs_data = .); - } > RAM -} INSERT AFTER .data; - -INCLUDE "nrf52_common.ld" diff --git a/platformio.ini b/platformio.ini index 869977d17..df3b89772 100644 --- a/platformio.ini +++ b/platformio.ini @@ -145,8 +145,6 @@ lib_deps = arduino-libraries/NTPClient#531eff39d9fbc831f3d03f706a161739203fbe2a lorol/LittleFS_esp32@^1.0.6 -# Hmm - this doesn't work yet -# board_build.ldscript = linker/esp32.extram.bss.ld lib_ignore = segger_rtt ESP32 BLE Arduino @@ -264,7 +262,4 @@ debug_tool = jlink upload_protocol = jlink monitor_port = /dev/ttyUSB0 ; this board's serial chip can only run at 115200, not faster -monitor_speed = 115200 - -# For experimenting with RAM sizes -# board_build.ldscript = linker/nrf52840_s140_sim832.ld +monitor_speed = 115200 \ No newline at end of file