projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename CONFIG_SYS_INIT_RAM_END into CONFIG_SYS_INIT_RAM_SIZE
[platform/kernel/u-boot.git]
/
arch
/
powerpc
/
cpu
/
ppc4xx
/
start.S
diff --git
a/arch/powerpc/cpu/ppc4xx/start.S
b/arch/powerpc/cpu/ppc4xx/start.S
index
87caea1
..
140bfc9
100644
(file)
--- a/
arch/powerpc/cpu/ppc4xx/start.S
+++ b/
arch/powerpc/cpu/ppc4xx/start.S
@@
-182,8
+182,8
@@
# endif
#endif /* CONFIG_SYS_INIT_DCACHE_CS */
# endif
#endif /* CONFIG_SYS_INIT_DCACHE_CS */
-#if (defined(CONFIG_SYS_INIT_RAM_DCACHE) && (CONFIG_SYS_INIT_RAM_
END
> (4 << 10)))
-#error Only 4k of init-ram is supported - please adjust CONFIG_SYS_INIT_RAM_
END
!
+#if (defined(CONFIG_SYS_INIT_RAM_DCACHE) && (CONFIG_SYS_INIT_RAM_
SIZE
> (4 << 10)))
+#error Only 4k of init-ram is supported - please adjust CONFIG_SYS_INIT_RAM_
SIZE
!
#endif
/*
#endif
/*
@@
-656,8
+656,8
@@
_start:
/* Clear Dcache to use as RAM */
addis r3,r0,CONFIG_SYS_INIT_RAM_ADDR@h
ori r3,r3,CONFIG_SYS_INIT_RAM_ADDR@l
/* Clear Dcache to use as RAM */
addis r3,r0,CONFIG_SYS_INIT_RAM_ADDR@h
ori r3,r3,CONFIG_SYS_INIT_RAM_ADDR@l
- addis r4,r0,CONFIG_SYS_INIT_RAM_
END
@h
- ori r4,r4,CONFIG_SYS_INIT_RAM_
END
@l
+ addis r4,r0,CONFIG_SYS_INIT_RAM_
SIZE
@h
+ ori r4,r4,CONFIG_SYS_INIT_RAM_
SIZE
@l
rlwinm. r5,r4,0,27,31
rlwinm r5,r4,27,5,31
beq ..d_ran
rlwinm. r5,r4,0,27,31
rlwinm r5,r4,27,5,31
beq ..d_ran
@@
-1091,8
+1091,8
@@
_start:
lis r3, CONFIG_SYS_INIT_RAM_ADDR@h
ori r3, r3, CONFIG_SYS_INIT_RAM_ADDR@l
lis r3, CONFIG_SYS_INIT_RAM_ADDR@h
ori r3, r3, CONFIG_SYS_INIT_RAM_ADDR@l
- lis r4, CONFIG_SYS_INIT_RAM_
END
@h
- ori r4, r4, CONFIG_SYS_INIT_RAM_
END
@l
+ lis r4, CONFIG_SYS_INIT_RAM_
SIZE
@h
+ ori r4, r4, CONFIG_SYS_INIT_RAM_
SIZE
@l
/*
* Convert the size, in bytes, to the number of cache lines/blocks
/*
* Convert the size, in bytes, to the number of cache lines/blocks
@@
-1119,12
+1119,12
@@
_start:
lis r1, CONFIG_SYS_INIT_RAM_ADDR@h
ori r1, r1, CONFIG_SYS_INIT_SP_OFFSET@l
lis r1, CONFIG_SYS_INIT_RAM_ADDR@h
ori r1, r1, CONFIG_SYS_INIT_SP_OFFSET@l
- lis r4, (CONFIG_SYS_INIT_RAM_
END
>> 2)@h
- ori r4, r4, (CONFIG_SYS_INIT_RAM_
END
>> 2)@l
+ lis r4, (CONFIG_SYS_INIT_RAM_
SIZE
>> 2)@h
+ ori r4, r4, (CONFIG_SYS_INIT_RAM_
SIZE
>> 2)@l
mtctr r4
lis r2, CONFIG_SYS_INIT_RAM_ADDR@h
mtctr r4
lis r2, CONFIG_SYS_INIT_RAM_ADDR@h
- ori r2, r2, CONFIG_SYS_INIT_RAM_
END
@l
+ ori r2, r2, CONFIG_SYS_INIT_RAM_
SIZE
@l
lis r4, CONFIG_SYS_INIT_RAM_PATTERN@h
ori r4, r4, CONFIG_SYS_INIT_RAM_PATTERN@l
lis r4, CONFIG_SYS_INIT_RAM_PATTERN@h
ori r4, r4, CONFIG_SYS_INIT_RAM_PATTERN@l
@@
-1414,8
+1414,8
@@
relocate_code:
lis r3, CONFIG_SYS_INIT_RAM_ADDR@h
ori r3, r3, CONFIG_SYS_INIT_RAM_ADDR@l
lis r3, CONFIG_SYS_INIT_RAM_ADDR@h
ori r3, r3, CONFIG_SYS_INIT_RAM_ADDR@l
- lis r4, CONFIG_SYS_INIT_RAM_
END
@h
- ori r4, r4, CONFIG_SYS_INIT_RAM_
END
@l
+ lis r4, CONFIG_SYS_INIT_RAM_
SIZE
@h
+ ori r4, r4, CONFIG_SYS_INIT_RAM_
SIZE
@l
add r4, r4, r3
bl invalidate_dcache_range
add r4, r4, r3
bl invalidate_dcache_range