summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-03-27 21:20:29 +0200
committerWolfgang Denk <wd@denx.de>2011-03-27 21:20:29 +0200
commitc04bf5e9a45d7335681352faa125193258f8e976 (patch)
treeab512a5a8356b6f492100925acb63638a7c10ce9 /arch/sh
parentb0c5ceb305054aadf2f810b0b7bfcc94926b78ad (diff)
parent05858736f5f1050d776571451995db81e3f5a5d7 (diff)
downloadblackbird-obmc-uboot-c04bf5e9a45d7335681352faa125193258f8e976.tar.gz
blackbird-obmc-uboot-c04bf5e9a45d7335681352faa125193258f8e976.zip
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/cpu/sh2/u-boot.lds2
-rw-r--r--arch/sh/cpu/sh3/u-boot.lds2
-rw-r--r--arch/sh/cpu/sh4/u-boot.lds2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/cpu/sh2/u-boot.lds b/arch/sh/cpu/sh2/u-boot.lds
index 7c0a18d62c..b86a82297f 100644
--- a/arch/sh/cpu/sh2/u-boot.lds
+++ b/arch/sh/cpu/sh2/u-boot.lds
@@ -91,5 +91,5 @@ SECTIONS
}
PROVIDE (bss_end = .);
- PROVIDE (_end = .);
+ PROVIDE (__bss_end__ = .);
}
diff --git a/arch/sh/cpu/sh3/u-boot.lds b/arch/sh/cpu/sh3/u-boot.lds
index 271624636b..9bf8503640 100644
--- a/arch/sh/cpu/sh3/u-boot.lds
+++ b/arch/sh/cpu/sh3/u-boot.lds
@@ -98,5 +98,5 @@ SECTIONS
}
PROVIDE (bss_end = .);
- PROVIDE (_end = .);
+ PROVIDE (__bss_end__ = .);
}
diff --git a/arch/sh/cpu/sh4/u-boot.lds b/arch/sh/cpu/sh4/u-boot.lds
index 0f42325aff..d9c70bce09 100644
--- a/arch/sh/cpu/sh4/u-boot.lds
+++ b/arch/sh/cpu/sh4/u-boot.lds
@@ -95,5 +95,5 @@ SECTIONS
}
PROVIDE (bss_end = .);
- PROVIDE (_end = .);
+ PROVIDE (__bss_end__ = .);
}
OpenPOWER on IntegriCloud