summaryrefslogtreecommitdiff
path: root/cpu/mpc85xx
diff options
context:
space:
mode:
authorPeter Tyser <ptyser@xes-inc.com>2009-10-07 11:45:00 -0500
committerWolfgang Denk <wd@denx.de>2009-10-08 00:33:47 +0200
commit3beb40c2473f0dd373231c723d88c51e46ad96f7 (patch)
tree5f2deb25b25aefdff6e26e5ea132dbc1739c0e23 /cpu/mpc85xx
parent3469424cb6d939c7aedf1e0efdec44a797c0a18c (diff)
downloadu-boot-imx-3beb40c2473f0dd373231c723d88c51e46ad96f7.zip
u-boot-imx-3beb40c2473f0dd373231c723d88c51e46ad96f7.tar.gz
u-boot-imx-3beb40c2473f0dd373231c723d88c51e46ad96f7.tar.bz2
85xx: Ensure BSS segment isn't linked at address 0
When U-Boot is relocated from flash to RAM pointers are modified accordingly. However, pointers initialzed with NULL values should not be modified so that they maintain their intended NULL value. If the BSS segment is linked at address 0 its address will not be updated as necessary during relocation. This is a temporary workaround. The end goal is to add support to U-Boot to dynamically locate the BSS at an arbitrary address at runtime. When the ability to fixup the BSS inteligently is added, this workaround can be removed and the 85xx link script can put the BSS at a fixed address at link time. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Diffstat (limited to 'cpu/mpc85xx')
-rw-r--r--cpu/mpc85xx/u-boot.lds11
1 files changed, 11 insertions, 0 deletions
diff --git a/cpu/mpc85xx/u-boot.lds b/cpu/mpc85xx/u-boot.lds
index a347cd1..183dce9 100644
--- a/cpu/mpc85xx/u-boot.lds
+++ b/cpu/mpc85xx/u-boot.lds
@@ -131,6 +131,17 @@ SECTIONS
. = RESET_VECTOR_ADDRESS + 0x4;
+ /*
+ * Make sure that the bss segment isn't linked at 0x0, otherwise its
+ * address won't be updated during relocation fixups. Note that
+ * this is a temporary fix. Code to dynamically the fixup the bss
+ * location will be added in the future. When the bss relocation
+ * fixup code is present this workaround should be removed.
+ */
+#if (RESET_VECTOR_ADDRESS == 0xfffffffc)
+ . |= 0x10;
+#endif
+
__bss_start = .;
.bss (NOLOAD) :
{