aboutsummaryrefslogtreecommitdiff
path: root/arch/i386
diff options
context:
space:
mode:
authorGraeme Russ <graeme.russ@gmail.com>2010-10-07 20:03:27 +1100
committerGraeme Russ <graeme.russ@gmail.com>2010-10-07 20:03:27 +1100
commit88fa0a6eb906b532cd073b6e3d8f688c47404709 (patch)
tree051370dd80becb73110138d0eb39a0767bbb83a8 /arch/i386
parent00940a229d564044d52a5449bce14090c7298f92 (diff)
downloadu-boot-linaro-stable-88fa0a6eb906b532cd073b6e3d8f688c47404709.tar.gz
x86: Remove usage of %ebp as a return pointer
Using %ebp as a return pointer prevents creating 'load anywhere' images
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/cpu/sc520/sc520_asm.S6
-rw-r--r--arch/i386/cpu/start.S12
-rw-r--r--arch/i386/cpu/start16.S2
3 files changed, 10 insertions, 10 deletions
diff --git a/arch/i386/cpu/sc520/sc520_asm.S b/arch/i386/cpu/sc520/sc520_asm.S
index e0d3102ce..a18e2c3d0 100644
--- a/arch/i386/cpu/sc520/sc520_asm.S
+++ b/arch/i386/cpu/sc520/sc520_asm.S
@@ -517,7 +517,7 @@ bad_ram:
jmp bad_reint
dram_done:
- jmp *%ebp
+ jmp mem_init_ret
#if CONFIG_SYS_SDRAM_ECC_ENABLE
.globl init_ecc
@@ -562,7 +562,7 @@ set_ecc:
movb %al,(%edi)
out:
- jmp *%ebp
+ jmp init_ecc_ret
#endif
/*
@@ -607,4 +607,4 @@ bank3: movl (%edi), %eax
done:
movl %ebx, %eax
- jmp *%ebp
+ jmp get_mem_size_ret
diff --git a/arch/i386/cpu/start.S b/arch/i386/cpu/start.S
index 819274f05..551965f42 100644
--- a/arch/i386/cpu/start.S
+++ b/arch/i386/cpu/start.S
@@ -1,7 +1,7 @@
/*
* U-boot - i386 Startup Code
*
- * Copyright (c) 2002 Omicron Ceti AB, Daniel Engström <denaiel@omicron.se>
+ * Copyright (c) 2002 Omicron Ceti AB, Daniel Engstr�m <denaiel@omicron.se>
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -79,18 +79,18 @@ _start:
* to store the return address */
/* Early platform init (setup gpio, etc ) */
- mov $early_board_init_ret, %ebp
jmp early_board_init
+.globl early_board_init_ret
early_board_init_ret:
/* size memory */
- mov $mem_init_ret, %ebp
jmp mem_init
+.globl mem_init_ret
mem_init_ret:
/* fetch memory size (into %eax) */
- mov $get_mem_size_ret, %ebp
jmp get_mem_size
+.globl get_mem_size_ret
get_mem_size_ret:
#if CONFIG_SYS_SDRAM_ECC_ENABLE
@@ -98,9 +98,9 @@ get_mem_size_ret:
movl %ebx, %ecx
andl $GD_FLG_COLD_BOOT, %ecx
jz init_ecc_ret
- mov $init_ecc_ret, %ebp
jmp init_ecc
+.globl init_ecc_ret
init_ecc_ret:
#endif
@@ -116,7 +116,7 @@ mem_ok:
pushl $0
popl %eax
cmpl $0, %eax
- jne no_stack
+ jne die
push $0x55aa55aa
popl %ebx
cmpl $0x55aa55aa, %ebx
diff --git a/arch/i386/cpu/start16.S b/arch/i386/cpu/start16.S
index 2a5cca9d6..0de4d0939 100644
--- a/arch/i386/cpu/start16.S
+++ b/arch/i386/cpu/start16.S
@@ -35,8 +35,8 @@ start16:
* First we let the BSP do some early initialization
* this code have to map the flash to its final position
*/
- mov $board_init16_ret, %bp
jmp board_init16
+.globl board_init16_ret
board_init16_ret:
/* Turn of cache (this might require a 486-class CPU) */