Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "PowerPC: Add support for -msingle-pic-base"

Browse Source 
This reverts commit 39768f7715.

Reson: it breaks a number of boards with embedded environment as the
code size grows in some places.
master
Wolfgang Denk 14 years ago
parent 9d8fbd1b20
commit 8c4734e9af
13 changed files with 12 additions and 127 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      arch/powerpc/config.mk
  2. 11
      arch/powerpc/cpu/74xx_7xx/start.S
  3. 11
      arch/powerpc/cpu/mpc512x/start.S
  4. 11
      arch/powerpc/cpu/mpc5xx/start.S
  5. 11
      arch/powerpc/cpu/mpc5xxx/start.S
  6. 11
      arch/powerpc/cpu/mpc8220/start.S
  7. 11
      arch/powerpc/cpu/mpc824x/start.S
  8. 6
      arch/powerpc/cpu/mpc8260/start.S
  9. 11
      arch/powerpc/cpu/mpc83xx/start.S
  10. 10
      arch/powerpc/cpu/mpc85xx/start.S
  11. 11
      arch/powerpc/cpu/mpc86xx/start.S
  12. 11
      arch/powerpc/cpu/mpc8xx/start.S
  13. 22
      arch/powerpc/cpu/ppc4xx/start.S

2
arch/powerpc/config.mk
Unescape View File

@ -26,8 +26,6 @@ CROSS_COMPILE ?= ppc_8xx-
CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
LDFLAGS_FINAL += --gc-sections
PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections -fdata-sections
PLATFORM_RELFLAGS += $(call cc-option,-msingle-pic-base,)
PLATFORM_RELFLAGS += $(call cc-option,-fno-jump-tables,)
PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__
PLATFORM_LDFLAGS += -n

11
arch/powerpc/cpu/74xx_7xx/start.S
Unescape View File

@ -274,11 +274,7 @@ in_flash:
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
@ -592,11 +588,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

11
arch/powerpc/cpu/mpc512x/start.S
Unescape View File

@ -255,11 +255,7 @@ in_flash:
/*------------------------------------------------------*/
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
/* r3: IMMR */
lis r3, CONFIG_SYS_IMMR@h
/* run low-level CPU init code (in Flash) */
@ -490,11 +486,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

11
arch/powerpc/cpu/mpc5xx/start.S
Unescape View File

@ -174,11 +174,7 @@ in_flash:
/*----------------------------------------------------------------------*/
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
/* r3: IMMR */
bl cpu_init_f /* run low-level CPU init code (from Flash) */
@ -367,11 +363,6 @@ relocate_code:
mr r10, r5 /* Save copy of monitor destination Address in SRAM */
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

11
arch/powerpc/cpu/mpc5xxx/start.S
Unescape View File

@ -160,11 +160,7 @@ lowboot_reentry:
/*--------------------------------------------------------------*/
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
/* r3: IMMR */
bl cpu_init_f /* run low-level CPU init code (in Flash)*/
@ -553,11 +549,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

11
arch/powerpc/cpu/mpc8220/start.S
Unescape View File

@ -129,11 +129,7 @@ _start:
/*--------------------------------------------------------------*/
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
/* r3: IMMR */
bl cpu_init_f /* run low-level CPU init code (in Flash)*/
@ -526,11 +522,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

11
arch/powerpc/cpu/mpc824x/start.S
Unescape View File

@ -183,11 +183,7 @@ in_flash:
/*----------------------------------------------------------------------*/
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
/* r3: IMMR */
bl cpu_init_f /* run low-level CPU init code (from Flash) */
@ -456,11 +452,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 */
#ifdef CONFIG_SYS_RAMBOOT
lis r4, CONFIG_SYS_SDRAM_BASE@h /* Source Address */

6
arch/powerpc/cpu/mpc8260/start.S
Unescape View File

@ -236,11 +236,7 @@ in_flash:
/*--------------------------------------------------------------*/
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
/* r3: IMMR */
bl cpu_init_f /* run low-level CPU init code (in Flash)*/

11
arch/powerpc/cpu/mpc83xx/start.S
Unescape View File

@ -285,11 +285,7 @@ in_flash:
/*------------------------------------------------------*/
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
/* r3: IMMR */
lis r3, CONFIG_SYS_IMMR@h
/* run low-level CPU init code (in Flash)*/
@ -826,11 +822,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

10
arch/powerpc/cpu/mpc85xx/start.S
Unescape View File

@ -421,11 +421,6 @@ _start_cont:
stw r0,+12(r1) /* Save return addr (underflow vect) */
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_early_f
/* switch back to AS = 0 */
@ -926,11 +921,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

11
arch/powerpc/cpu/mpc86xx/start.S
Unescape View File

@ -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

11
arch/powerpc/cpu/mpc8xx/start.S
Unescape View File

@ -188,11 +188,7 @@ in_flash:
/*----------------------------------------------------------------------*/
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
/* r3: IMMR */
bl cpu_init_f /* run low-level CPU init code (from Flash) */
@ -477,11 +473,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

22
arch/powerpc/cpu/ppc4xx/start.S
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save