summaryrefslogtreecommitdiffstats
path: root/src/target
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2019-05-13 00:53:13 +0700
committerVadim Yanitskiy <axilirator@gmail.com>2019-05-13 02:28:36 +0700
commit01e374d27c5cb883c18ec55bd55976f62309303d (patch)
tree098ebb6d66edba082b760508b95fbf154e1cfb60 /src/target
parent0f5f76f65149f82b00ffba40794c59add7bedc88 (diff)
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
Diffstat (limited to 'src/target')
-rw-r--r--src/target/firmware/board/compal/ram.lds4
-rw-r--r--src/target/firmware/board/compal_e88/flash.lds4
2 files changed, 4 insertions, 4 deletions
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 @@ SECTIONS
. = 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 @@ SECTIONS
PROVIDE(_got_end = ADDR(.got) + SIZEOF(.got));
/* reserved ram */
- .compal.reservedram 0x800000 (NOLOAD) : {
- . = 0xff;
+ .compal.reservedram 0x800038 (NOLOAD) : {
+ . = 0xff - 0x38;
} > IRAM
/* initialized data */