<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12813">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">relocate application to after the DFU bootloader<br><br>without this relocation the DFU bootloader can jump to the<br>application but following executed code would not be the one from<br>the application.<br><br>Change-Id: Ieeefcf80918fd10e48debab6ff08505f6588811c<br>---<br>M sysmoOCTSIM/gcc/Makefile<br>R sysmoOCTSIM/gcc/gcc/same54n19a_dfu.ld<br>D sysmoOCTSIM/gcc/gcc/same54p20a_sram.ld<br>3 files changed, 5 insertions(+), 167 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/13/12813/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmoOCTSIM/gcc/Makefile b/sysmoOCTSIM/gcc/Makefile</span><br><span>index 7bc5fd3..572fb21 100644</span><br><span>--- a/sysmoOCTSIM/gcc/Makefile</span><br><span>+++ b/sysmoOCTSIM/gcc/Makefile</span><br><span>@@ -184,7 +184,7 @@</span><br><span> $(QUOTE)arm-none-eabi-gcc$(QUOTE) -o $(OUTPUT_FILE_NAME).elf $(OBJS_AS_ARGS) -Wl,--start-group -lm -Wl,--end-group -mthumb \</span><br><span> -Wl,-Map="$(OUTPUT_FILE_NAME).map" --specs=nano.specs -Wl,--gc-sections -mcpu=cortex-m4 \</span><br><span> \</span><br><span style="color: hsl(0, 100%, 40%);">--T"../gcc/gcc/same54n19a_flash.ld" \</span><br><span style="color: hsl(120, 100%, 40%);">+-T"../gcc/gcc/same54n19a_dfu.ld" \</span><br><span> -L"../gcc/gcc"</span><br><span> @echo Finished building target: $@</span><br><span> </span><br><span>diff --git a/sysmoOCTSIM/gcc/gcc/same54p20a_flash.ld b/sysmoOCTSIM/gcc/gcc/same54n19a_dfu.ld</span><br><span>similarity index 95%</span><br><span>rename from sysmoOCTSIM/gcc/gcc/same54p20a_flash.ld</span><br><span>rename to sysmoOCTSIM/gcc/gcc/same54n19a_dfu.ld</span><br><span>index 08099d2..7d76cc2 100644</span><br><span>--- a/sysmoOCTSIM/gcc/gcc/same54p20a_flash.ld</span><br><span>+++ b/sysmoOCTSIM/gcc/gcc/same54n19a_dfu.ld</span><br><span>@@ -1,7 +1,7 @@</span><br><span> /**</span><br><span> * \file</span><br><span> *</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief Linker script for running in internal FLASH on the SAME54P20A</span><br><span style="color: hsl(120, 100%, 40%);">+ * \brief Linker script for running in internal FLASH on the SAME54N19A</span><br><span> *</span><br><span> * Copyright (c) 2018 Microchip Technology Inc.</span><br><span> *</span><br><span>@@ -35,14 +35,14 @@</span><br><span> /* Memory Spaces Definitions */</span><br><span> MEMORY</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- rom (rx) : ORIGIN = 0x00000000, LENGTH = 0x00100000</span><br><span style="color: hsl(0, 100%, 40%);">- ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000</span><br><span style="color: hsl(120, 100%, 40%);">+ rom (rx) : ORIGIN = 0x00000000 + 16K, LENGTH = 0x00080000 - 16K</span><br><span style="color: hsl(120, 100%, 40%);">+ ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000</span><br><span> bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000</span><br><span> qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000</span><br><span> }</span><br><span> </span><br><span> /* The stack size used by the application. NOTE: you need to adjust according to your application. */</span><br><span style="color: hsl(0, 100%, 40%);">-STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x10000;</span><br><span style="color: hsl(120, 100%, 40%);">+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0xC000;</span><br><span> </span><br><span> /* Section Definitions */</span><br><span> SECTIONS</span><br><span>diff --git a/sysmoOCTSIM/gcc/gcc/same54p20a_sram.ld b/sysmoOCTSIM/gcc/gcc/same54p20a_sram.ld</span><br><span>deleted file mode 100644</span><br><span>index b3be5b3..0000000</span><br><span>--- a/sysmoOCTSIM/gcc/gcc/same54p20a_sram.ld</span><br><span>+++ /dev/null</span><br><span>@@ -1,162 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/**</span><br><span style="color: hsl(0, 100%, 40%);">- * \file</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \brief Linker script for running in internal SRAM on the SAME54P20A</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Copyright (c) 2018 Microchip Technology Inc.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \asf_license_start</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \page License</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * SPDX-License-Identifier: Apache-2.0</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Licensed under the Apache License, Version 2.0 (the "License"); you may</span><br><span style="color: hsl(0, 100%, 40%);">- * not use this file except in compliance with the License.</span><br><span style="color: hsl(0, 100%, 40%);">- * You may obtain a copy of the Licence at</span><br><span style="color: hsl(0, 100%, 40%);">- * </span><br><span style="color: hsl(0, 100%, 40%);">- * http://www.apache.org/licenses/LICENSE-2.0</span><br><span style="color: hsl(0, 100%, 40%);">- * </span><br><span style="color: hsl(0, 100%, 40%);">- * Unless required by applicable law or agreed to in writing, software</span><br><span style="color: hsl(0, 100%, 40%);">- * distributed under the License is distributed on an AS IS BASIS, WITHOUT</span><br><span style="color: hsl(0, 100%, 40%);">- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.</span><br><span style="color: hsl(0, 100%, 40%);">- * See the License for the specific language governing permissions and</span><br><span style="color: hsl(0, 100%, 40%);">- * limitations under the License.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * \asf_license_stop</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")</span><br><span style="color: hsl(0, 100%, 40%);">-OUTPUT_ARCH(arm)</span><br><span style="color: hsl(0, 100%, 40%);">-SEARCH_DIR(.)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Memory Spaces Definitions */</span><br><span style="color: hsl(0, 100%, 40%);">-MEMORY</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- ram (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000</span><br><span style="color: hsl(0, 100%, 40%);">- bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000</span><br><span style="color: hsl(0, 100%, 40%);">- qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* The stack size used by the application. NOTE: you need to adjust according to your application. */</span><br><span style="color: hsl(0, 100%, 40%);">-STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x10000;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Section Definitions */</span><br><span style="color: hsl(0, 100%, 40%);">-SECTIONS</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- .text :</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(4);</span><br><span style="color: hsl(0, 100%, 40%);">- _sfixed = .;</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP(*(.vectors .vectors.*))</span><br><span style="color: hsl(0, 100%, 40%);">- *(.text .text.* .gnu.linkonce.t.*)</span><br><span style="color: hsl(0, 100%, 40%);">- *(.glue_7t) *(.glue_7)</span><br><span style="color: hsl(0, 100%, 40%);">- *(.rodata .rodata* .gnu.linkonce.r.*)</span><br><span style="color: hsl(0, 100%, 40%);">- *(.ARM.extab* .gnu.linkonce.armextab.*)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Support C constructors, and C destructors in both user code</span><br><span style="color: hsl(0, 100%, 40%);">- and the C library. This also provides support for C++ code. */</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(4);</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP(*(.init))</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(4);</span><br><span style="color: hsl(0, 100%, 40%);">- __preinit_array_start = .;</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP (*(.preinit_array))</span><br><span style="color: hsl(0, 100%, 40%);">- __preinit_array_end = .;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(4);</span><br><span style="color: hsl(0, 100%, 40%);">- __init_array_start = .;</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP (*(SORT(.init_array.*)))</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP (*(.init_array))</span><br><span style="color: hsl(0, 100%, 40%);">- __init_array_end = .;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(4);</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP (*crtbegin.o(.ctors))</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP (*(EXCLUDE_FILE (*crtend.o) .ctors))</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP (*(SORT(.ctors.*)))</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP (*crtend.o(.ctors))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(4);</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP(*(.fini))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(4);</span><br><span style="color: hsl(0, 100%, 40%);">- __fini_array_start = .;</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP (*(.fini_array))</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP (*(SORT(.fini_array.*)))</span><br><span style="color: hsl(0, 100%, 40%);">- __fini_array_end = .;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP (*crtbegin.o(.dtors))</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP (*(EXCLUDE_FILE (*crtend.o) .dtors))</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP (*(SORT(.dtors.*)))</span><br><span style="color: hsl(0, 100%, 40%);">- KEEP (*crtend.o(.dtors))</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(4);</span><br><span style="color: hsl(0, 100%, 40%);">- _efixed = .; /* End of text section */</span><br><span style="color: hsl(0, 100%, 40%);">- } > ram</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* .ARM.exidx is sorted, so has to go in its own output section. */</span><br><span style="color: hsl(0, 100%, 40%);">- PROVIDE_HIDDEN (__exidx_start = .);</span><br><span style="color: hsl(0, 100%, 40%);">- .ARM.exidx :</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- *(.ARM.exidx* .gnu.linkonce.armexidx.*)</span><br><span style="color: hsl(0, 100%, 40%);">- } > ram</span><br><span style="color: hsl(0, 100%, 40%);">- PROVIDE_HIDDEN (__exidx_end = .);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(4);</span><br><span style="color: hsl(0, 100%, 40%);">- _etext = .;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- .relocate : AT (_etext)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(4);</span><br><span style="color: hsl(0, 100%, 40%);">- _srelocate = .;</span><br><span style="color: hsl(0, 100%, 40%);">- *(.ramfunc .ramfunc.*);</span><br><span style="color: hsl(0, 100%, 40%);">- *(.data .data.*);</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(4);</span><br><span style="color: hsl(0, 100%, 40%);">- _erelocate = .;</span><br><span style="color: hsl(0, 100%, 40%);">- } > ram</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- .bkupram (NOLOAD):</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(8);</span><br><span style="color: hsl(0, 100%, 40%);">- _sbkupram = .;</span><br><span style="color: hsl(0, 100%, 40%);">- *(.bkupram .bkupram.*);</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(8);</span><br><span style="color: hsl(0, 100%, 40%);">- _ebkupram = .;</span><br><span style="color: hsl(0, 100%, 40%);">- } > bkupram</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- .qspi (NOLOAD):</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(8);</span><br><span style="color: hsl(0, 100%, 40%);">- _sqspi = .;</span><br><span style="color: hsl(0, 100%, 40%);">- *(.qspi .qspi.*);</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(8);</span><br><span style="color: hsl(0, 100%, 40%);">- _eqspi = .;</span><br><span style="color: hsl(0, 100%, 40%);">- } > qspi</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* .bss section which is used for uninitialized data */</span><br><span style="color: hsl(0, 100%, 40%);">- .bss (NOLOAD) :</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(4);</span><br><span style="color: hsl(0, 100%, 40%);">- _sbss = . ;</span><br><span style="color: hsl(0, 100%, 40%);">- _szero = .;</span><br><span style="color: hsl(0, 100%, 40%);">- *(.bss .bss.*)</span><br><span style="color: hsl(0, 100%, 40%);">- *(COMMON)</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(4);</span><br><span style="color: hsl(0, 100%, 40%);">- _ebss = . ;</span><br><span style="color: hsl(0, 100%, 40%);">- _ezero = .;</span><br><span style="color: hsl(0, 100%, 40%);">- } > ram</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* stack section */</span><br><span style="color: hsl(0, 100%, 40%);">- .stack (NOLOAD):</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(8);</span><br><span style="color: hsl(0, 100%, 40%);">- _sstack = .;</span><br><span style="color: hsl(0, 100%, 40%);">- . = . + STACK_SIZE;</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(8);</span><br><span style="color: hsl(0, 100%, 40%);">- _estack = .;</span><br><span style="color: hsl(0, 100%, 40%);">- } > ram</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- . = ALIGN(4);</span><br><span style="color: hsl(0, 100%, 40%);">- _end = . ;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12813">change 12813</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12813"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ieeefcf80918fd10e48debab6ff08505f6588811c </div>
<div style="display:none"> Gerrit-Change-Number: 12813 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>