diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-11-12 22:24:06 +0100 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-11-12 22:24:06 +0100 | 
| commit | d963e84c92a63b4e6c4f2f80482a5ecbe9b24fe0 (patch) | |
| tree | 07dd5889d73f4b66ad608815adcf6f2f953d9501 /arch/powerpc/cpu/mpc86xx/start.S | |
| parent | 66fca016057b1c6b697552cc7220ebada9d4f82d (diff) | |
| parent | 0c0892be0d93a5a892b93739c5eb3bf692fed4ff (diff) | |
| download | olio-uboot-2014.01-d963e84c92a63b4e6c4f2f80482a5ecbe9b24fe0.tar.xz olio-uboot-2014.01-d963e84c92a63b4e6c4f2f80482a5ecbe9b24fe0.zip | |
Merge branch 'master' of /home/wd/git/u-boot/master
Diffstat (limited to 'arch/powerpc/cpu/mpc86xx/start.S')
| -rw-r--r-- | arch/powerpc/cpu/mpc86xx/start.S | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/arch/powerpc/cpu/mpc86xx/start.S b/arch/powerpc/cpu/mpc86xx/start.S index 3817f19d5..612711569 100644 --- a/arch/powerpc/cpu/mpc86xx/start.S +++ b/arch/powerpc/cpu/mpc86xx/start.S @@ -30,6 +30,7 @@   *  board_init lies at a quite high address and when the cpu has   *  jumped there, everything is ok.   */ +#include <asm-offsets.h>  #include <config.h>  #include <mpc86xx.h>  #include <timestamp.h> @@ -870,7 +871,7 @@ lock_ram_in_cache:  	 */  	lis	r3, (CONFIG_SYS_INIT_RAM_ADDR & ~31)@h  	ori	r3, r3, (CONFIG_SYS_INIT_RAM_ADDR & ~31)@l -	li	r4, ((CONFIG_SYS_INIT_RAM_END & ~31) + \ +	li	r4, ((CONFIG_SYS_INIT_RAM_SIZE & ~31) + \  		     (CONFIG_SYS_INIT_RAM_ADDR & 31) + 31) / 32  	mtctr	r4  1: @@ -905,7 +906,7 @@ unlock_ram_in_cache:  	/* invalidate the INIT_RAM section */  	lis	r3, (CONFIG_SYS_INIT_RAM_ADDR & ~31)@h  	ori	r3, r3, (CONFIG_SYS_INIT_RAM_ADDR & ~31)@l -	li	r4, ((CONFIG_SYS_INIT_RAM_END & ~31) + \ +	li	r4, ((CONFIG_SYS_INIT_RAM_SIZE & ~31) + \  		     (CONFIG_SYS_INIT_RAM_ADDR & 31) + 31) / 32  	mtctr	r4  1:	icbi	r0, r3 |