aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/cpu/mpc86xx/start.S
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-04-20 22:11:21 +0200
committerWolfgang Denk <wd@denx.de>2011-04-20 22:11:21 +0200
commit8c4734e9afc0856f297805563e83fb74398b9a16 (patch)
tree5a282c2946d37d985aec9709564faf11793f6c62 /arch/powerpc/cpu/mpc86xx/start.S
parent9d8fbd1b20e262a4cfc5da4ee64aebff443d2be8 (diff)
downloadu-boot-linaro-stable-8c4734e9afc0856f297805563e83fb74398b9a16.tar.gz
Revert "PowerPC: Add support for -msingle-pic-base"
This reverts commit 39768f7715ed637ef02f49fc7de664cc1aaf14b3. Reson: it breaks a number of boards with embedded environment as the code size grows in some places.
Diffstat (limited to 'arch/powerpc/cpu/mpc86xx/start.S')
-rw-r--r--arch/powerpc/cpu/mpc86xx/start.S11
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/powerpc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S
index 2ec7fd46b..3e3c21eef 100644
--- a/arch/powerpc/cpu/mpc86xx/start.S
+++ b/arch/powerpc/cpu/mpc86xx/start.S
@@ -255,11 +255,7 @@ addr_trans_enabled:
stwu r0, -4(r1) /* stack backtraces terminate cleanly */
GET_GOT /* initialize GOT access */
-#if defined(__pic__) && __pic__ == 1
- /* Needed for upcoming -msingle-pic-base */
- bl _GLOBAL_OFFSET_TABLE_@local-4
- mflr r30
-#endif
+
/* run low-level CPU init code (from Flash) */
bl cpu_init_f
sync
@@ -624,11 +620,6 @@ relocate_code:
mr r10, r5 /* Save copy of Destination Address */
GET_GOT
-#if defined(__pic__) && __pic__ == 1
- /* Needed for upcoming -msingle-pic-base */
- bl _GLOBAL_OFFSET_TABLE_@local-4
- mflr r30
-#endif
mr r3, r5 /* Destination Address */
lis r4, CONFIG_SYS_MONITOR_BASE@h /* Source Address */
ori r4, r4, CONFIG_SYS_MONITOR_BASE@l