diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-04-20 22:11:21 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-20 22:11:21 +0200 |
| commit | 8c4734e9afc0856f297805563e83fb74398b9a16 (patch) | |
| tree | 5a282c2946d37d985aec9709564faf11793f6c62 /arch/powerpc/cpu/ppc4xx | |
| parent | 9d8fbd1b20e262a4cfc5da4ee64aebff443d2be8 (diff) | |
| download | u-boot-imx-8c4734e9afc0856f297805563e83fb74398b9a16.zip u-boot-imx-8c4734e9afc0856f297805563e83fb74398b9a16.tar.gz u-boot-imx-8c4734e9afc0856f297805563e83fb74398b9a16.tar.bz2 | |
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/ppc4xx')
| -rw-r--r-- | arch/powerpc/cpu/ppc4xx/start.S | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index aa03d9a..b43e22c 100644 --- a/arch/powerpc/cpu/ppc4xx/start.S +++ b/arch/powerpc/cpu/ppc4xx/start.S @@ -262,11 +262,6 @@ bl reconfig_tlb0 #endif GET_GOT -#if defined(__pic__) && __pic__ == 1 - /* Needed for upcoming -msingle-pic-base */ - bl _GLOBAL_OFFSET_TABLE_@local-4 - mflr r30 -#endif bl cpu_init_f /* run low-level CPU init code (from Flash) */ bl board_init_f /* NOTREACHED - board_init_f() does not return */ @@ -804,11 +799,7 @@ _start: ori r0,r0, RESET_VECTOR@l stwu r1,-8(r1) /* Save back chain and move SP */ stw r0,+12(r1) /* Save return addr (underflow vect) */ -#if defined(__pic__) && __pic__ == 1 - /* Needed for upcoming -msingle-pic-base */ - bl _GLOBAL_OFFSET_TABLE_@local-4 - mflr r30 -#endif + #ifdef CONFIG_NAND_SPL bl nand_boot_common /* will not return */ #else @@ -923,11 +914,7 @@ _start: 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 + bl board_init_f /* run first part of init code (from Flash) */ /* NOTREACHED - board_init_f() does not return */ @@ -1192,11 +1179,6 @@ _start: stw r0, +12(r1) /* Save return addr (underflow vect) */ #endif /* CONFIG_SYS_INIT_DCACHE_CS */ -#if defined(__pic__) && __pic__ == 1 - /* Needed for upcoming -msingle-pic-base */ - bl _GLOBAL_OFFSET_TABLE_@local-4 - mflr r30 -#endif #ifdef CONFIG_NAND_SPL bl nand_boot_common /* will not return */ #else |