<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14006">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Verified
  Harald Welte: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">firmware/Makefile.inc: fix sections with overlapping VMA<br><br>Starting from [1], not only LMA but also VMA areas are now checked<br>for overlaps (see also [2]). This results into linking errors:<br><br>  arm-none-eabi-ld: section .text.exceptions VMA<br>    [000000000080001c,0000000000800037] overlaps section<br>    .compal.reservedram VMA [0000000000800000,00000000008000fe]<br>  arm-none-eabi-ld: section .text.exceptions VMA<br>    [000000000080001c,0000000000800037] overlaps section<br>    .compal.loader VMA [0000000000800000,00000000008000ff]<br><br>Let's try to work around this.<br><br>[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a87dd97a2098b7e18ff2574a4e81ae521ef7e6f2<br>[2] https://sourceware.org/bugzilla/show_bug.cgi?id=18452<br><br>Change-Id: I098ddd33aabd7ec27981e2f09d8582f167bb649b<br>Fixes: OS#1917<br>---<br>M src/target/firmware/board/compal/ram.lds<br>M src/target/firmware/board/compal_e88/flash.lds<br>2 files changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/firmware/board/compal/ram.lds b/src/target/firmware/board/compal/ram.lds</span><br><span>index b52b619..4f08a83 100644</span><br><span>--- a/src/target/firmware/board/compal/ram.lds</span><br><span>+++ b/src/target/firmware/board/compal/ram.lds</span><br><span>@@ -20,10 +20,10 @@</span><br><span>     . = 0x800000;</span><br><span> </span><br><span>     /* romloader data section, contains passthru interrupt vectors */</span><br><span style="color: hsl(0, 100%, 40%);">-    .compal.loader (NOLOAD) : { . = 0x100; } > LRAM</span><br><span style="color: hsl(120, 100%, 40%);">+    .compal.loader (NOLOAD) : { . = 0x1c; } > LRAM</span><br><span> </span><br><span>     /* image signature (prepended by osmocon according to phone type) */</span><br><span style="color: hsl(0, 100%, 40%);">-    .compal.header (NOLOAD) : { . = 4; } > LRAM</span><br><span style="color: hsl(120, 100%, 40%);">+    .compal.header 0x800100 (NOLOAD): { . = 4; } > LRAM</span><br><span> </span><br><span>     /* initialization code */</span><br><span>     . = ALIGN(4);</span><br><span>diff --git a/src/target/firmware/board/compal_e88/flash.lds b/src/target/firmware/board/compal_e88/flash.lds</span><br><span>index 67d727f..52148d9 100644</span><br><span>--- a/src/target/firmware/board/compal_e88/flash.lds</span><br><span>+++ b/src/target/firmware/board/compal_e88/flash.lds</span><br><span>@@ -91,8 +91,8 @@</span><br><span>     PROVIDE(_got_end = ADDR(.got) + SIZEOF(.got));</span><br><span> </span><br><span>     /* reserved ram  */</span><br><span style="color: hsl(0, 100%, 40%);">-    .compal.reservedram 0x800000 (NOLOAD) : {</span><br><span style="color: hsl(0, 100%, 40%);">-        . = 0xff;</span><br><span style="color: hsl(120, 100%, 40%);">+    .compal.reservedram 0x800038 (NOLOAD) : {</span><br><span style="color: hsl(120, 100%, 40%);">+        . = 0xff - 0x38;</span><br><span>     } > IRAM</span><br><span> </span><br><span>     /* initialized data */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14006">change 14006</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/14006"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I098ddd33aabd7ec27981e2f09d8582f167bb649b </div>
<div style="display:none"> Gerrit-Change-Number: 14006 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>