diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-02-02 21:57:19 +0100 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-02-02 21:57:19 +0100 | 
| commit | be9db564de898240034151c48cf9e0d03ece3f35 (patch) | |
| tree | f87b02a573c61fdab3f190de09e6b0c8061f446b /arch/arm/cpu/arm925t/start.S | |
| parent | 89ffa8dbb5bd0552f5f3399f4430a4c97f4d50d4 (diff) | |
| parent | 9e40808c3fe0237a8d49f10394d3a8e4e29540a6 (diff) | |
| download | olio-uboot-2014.01-be9db564de898240034151c48cf9e0d03ece3f35.tar.xz olio-uboot-2014.01-be9db564de898240034151c48cf9e0d03ece3f35.zip | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'arch/arm/cpu/arm925t/start.S')
| -rw-r--r-- | arch/arm/cpu/arm925t/start.S | 2 | 
1 files changed, 0 insertions, 2 deletions
| diff --git a/arch/arm/cpu/arm925t/start.S b/arch/arm/cpu/arm925t/start.S index 2c0c86942..20ecdd54c 100644 --- a/arch/arm/cpu/arm925t/start.S +++ b/arch/arm/cpu/arm925t/start.S @@ -202,7 +202,6 @@ stack_setup:  	cmp	r0, r6  	beq	clear_bss		/* skip relocation */  	mov	r1, r6			/* r1 <- scratch for copy_loop */ -	ldr	r2, _TEXT_BASE  	ldr	r3, _bss_start_ofs  	add	r2, r0, r3		/* r2 <- source end address	    */ @@ -257,7 +256,6 @@ clear_bss:  #ifndef CONFIG_PRELOADER  	ldr	r0, _bss_start_ofs  	ldr	r1, _bss_end_ofs -	ldr	r3, _TEXT_BASE		/* Text base */  	mov	r4, r6			/* reloc addr */  	add	r0, r0, r4  	add	r1, r1, r4 |