Change in osmocom-bb[master]: firmware/Makefile.inc: fix sections with overlapping VMA

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/14006 )

Change subject: firmware/Makefile.inc: fix sections with overlapping VMA
......................................................................

firmware/Makefile.inc: fix sections with overlapping VMA

Starting from [1], not only LMA but also VMA areas are now checked
for overlaps (see also [2]). This results into linking errors:

  arm-none-eabi-ld: section .text.exceptions VMA
    [000000000080001c,0000000000800037] overlaps section
    .compal.reservedram VMA [0000000000800000,00000000008000fe]
  arm-none-eabi-ld: section .text.exceptions VMA
    [000000000080001c,0000000000800037] overlaps section
    .compal.loader VMA [0000000000800000,00000000008000ff]

Let's try to work around this.

[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=a87dd97a2098b7e18ff2574a4e81ae521ef7e6f2
[2] https://sourceware.org/bugzilla/show_bug.cgi?id=18452

Change-Id: I098ddd33aabd7ec27981e2f09d8582f167bb649b
Fixes: OS#1917
---
M src/target/firmware/board/compal/ram.lds
M src/target/firmware/board/compal_e88/flash.lds
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Vadim Yanitskiy: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/target/firmware/board/compal/ram.lds b/src/target/firmware/board/compal/ram.lds
index b52b619..4f08a83 100644
--- a/src/target/firmware/board/compal/ram.lds
+++ b/src/target/firmware/board/compal/ram.lds
@@ -20,10 +20,10 @@
     . = 0x800000;
 
     /* romloader data section, contains passthru interrupt vectors */
-    .compal.loader (NOLOAD) : { . = 0x100; } > LRAM
+    .compal.loader (NOLOAD) : { . = 0x1c; } > LRAM
 
     /* image signature (prepended by osmocon according to phone type) */
-    .compal.header (NOLOAD) : { . = 4; } > LRAM
+    .compal.header 0x800100 (NOLOAD): { . = 4; } > LRAM
 
     /* initialization code */
     . = ALIGN(4);
diff --git a/src/target/firmware/board/compal_e88/flash.lds b/src/target/firmware/board/compal_e88/flash.lds
index 67d727f..52148d9 100644
--- a/src/target/firmware/board/compal_e88/flash.lds
+++ b/src/target/firmware/board/compal_e88/flash.lds
@@ -91,8 +91,8 @@
     PROVIDE(_got_end = ADDR(.got) + SIZEOF(.got));
 
     /* reserved ram  */
-    .compal.reservedram 0x800000 (NOLOAD) : {
-        . = 0xff;
+    .compal.reservedram 0x800038 (NOLOAD) : {
+        . = 0xff - 0x38;
     } > IRAM
 
     /* initialized data */

-- 
To view, visit https://gerrit.osmocom.org/14006
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I098ddd33aabd7ec27981e2f09d8582f167bb649b
Gerrit-Change-Number: 14006
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy <axilirator at gmail.com>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190514/7e5d3e0e/attachment.htm>