summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2017-01-15 16:49:06 +0100
committerHarald Welte <laforge@gnumonks.org>2017-01-15 20:46:27 +0100
commit41737fc4882ac67d515ed2f1d0acc2609a9c4ec7 (patch)
tree94461fd1f29da4cc6520eee577711aa94bd6f212
parent0cdf4b0a6821a0e970194ed5b122d3d6270c9814 (diff)
WIP: Attempt to make linker scripts compatible with binutils 2.27
In binutils-2.27, one can no longer have linker sections with overlapping VMA addresses. Let's try to work around this. See https://osmocom.org/issues/1917 for more details.
-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 */