summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoakim Tjernlund <Joakim.Tjernlund@transmode.se>2011-04-24 10:29:32 +0200
committerWolfgang Denk <wd@denx.de>2011-04-24 22:49:16 +0200
commitc1fa1b7d00712b41a6c710e7ed33782cb3f47191 (patch)
treeae4759fc8b10e49628e2948a35b5f75e1419b68f
parent735eb0f0e66b544b1dfaf6c43ce6e4bd9ae64b5e (diff)
downloadu-boot-imx-c1fa1b7d00712b41a6c710e7ed33782cb3f47191.zip
u-boot-imx-c1fa1b7d00712b41a6c710e7ed33782cb3f47191.tar.gz
u-boot-imx-c1fa1b7d00712b41a6c710e7ed33782cb3f47191.tar.bz2
powerpc, 8xx: Fix fallout from "Fixup all 8xx u-boot.lds scripts"
Two linker scripts for 8xx was missed. Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
-rw-r--r--board/matrix_vision/mvsmr/u-boot.lds2
-rw-r--r--board/rsdproto/u-boot.lds7
2 files changed, 5 insertions, 4 deletions
diff --git a/board/matrix_vision/mvsmr/u-boot.lds b/board/matrix_vision/mvsmr/u-boot.lds
index bf2ed04..57c37de 100644
--- a/board/matrix_vision/mvsmr/u-boot.lds
+++ b/board/matrix_vision/mvsmr/u-boot.lds
@@ -62,7 +62,7 @@ SECTIONS
_FIXUP_TABLE_ = .;
KEEP(*(.fixup))
}
- __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >> 2;
+ __got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;
__fixup_entries = (. - _FIXUP_TABLE_) >> 2;
.data :
diff --git a/board/rsdproto/u-boot.lds b/board/rsdproto/u-boot.lds
index 81728db..a729c52 100644
--- a/board/rsdproto/u-boot.lds
+++ b/board/rsdproto/u-boot.lds
@@ -74,11 +74,12 @@ SECTIONS
PROVIDE (erotext = .);
.reloc :
{
- *(.got)
_GOT2_TABLE_ = .;
- *(.got2)
+ KEEP(*(.got2))
+ KEEP(*(.got))
+ PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4);
_FIXUP_TABLE_ = .;
- *(.fixup)
+ KEEP(*(.fixup))
}
__got2_entries = ((_GLOBAL_OFFSET_TABLE_ - _GOT2_TABLE_) >> 2) - 1;
__fixup_entries = (. - _FIXUP_TABLE_)>>2;