Skip to content

Commit

Permalink
Merge pull request tock#4108 from alevy/fix-nmagic-root-cause
Browse files Browse the repository at this point in the history
Fix something that was not the root cause of relocation bug from tock#2219 at the time, the root cause was a bug in LLD, and now that bug is fixed, so we can use the canonical way of ensuring the relocation section has a predictable LMA
  • Loading branch information
ppannuto authored Jul 17, 2024
2 parents 1e3ee98 + 334d7af commit 31f299d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions boards/kernel_layout.ld
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ SECTIONS
* Tock assumes the relocation section follows all static elements and will
* copy (_erelocate - _srelocate) bytes from _etext to _srelocate.
*/
.relocate :
.relocate : AT (_etext)
{
. = ALIGN(4);
_srelocate = .;
Expand Down Expand Up @@ -294,7 +294,7 @@ SECTIONS

. = ALIGN(4);
_erelocate = .;
} > ram AT>rom
} > ram


.sram (NOLOAD) :
Expand Down

0 comments on commit 31f299d

Please sign in to comment.