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
Replace CONFIG_SYS_GBL_DATA_SIZE by auto-generated value
[platform/kernel/u-boot.git]
/
arch
/
arm
/
cpu
/
arm1176
/
start.S
diff --git
a/arch/arm/cpu/arm1176/start.S
b/arch/arm/cpu/arm1176/start.S
index
24e5bf4
..
c13cceb
100644
(file)
--- a/
arch/arm/cpu/arm1176/start.S
+++ b/
arch/arm/cpu/arm1176/start.S
@@
-30,6
+30,7
@@
* Base codes by scsuh (sc.suh)
*/
* Base codes by scsuh (sc.suh)
*/
+#include <asm-offsets.h>
#include <config.h>
#include <version.h>
#ifdef CONFIG_ENABLE_MMU
#include <config.h>
#include <version.h>
#ifdef CONFIG_ENABLE_MMU
@@
-546,7
+547,7
@@
skip_hw_init:
stack_setup:
ldr r0, =CONFIG_SYS_UBOOT_BASE /* base of copy in DRAM */
sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
stack_setup:
ldr r0, =CONFIG_SYS_UBOOT_BASE /* base of copy in DRAM */
sub r0, r0, #CONFIG_SYS_MALLOC_LEN /* malloc area */
- sub r0, r0, #
CONFIG_SYS
_GBL_DATA_SIZE /* bdinfo */
+ sub r0, r0, #
GENERATED
_GBL_DATA_SIZE /* bdinfo */
sub sp, r0, #12 /* leave 3 words for abort-stack */
bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
sub sp, r0, #12 /* leave 3 words for abort-stack */
bic sp, sp, #7 /* 8-byte alignment for ABI compliance */
@@
-663,7
+664,7
@@
phy_last_jump:
ldr r2, _armboot_start
sub r2, r2, #(CONFIG_SYS_MALLOC_LEN)
/* set base 2 words into abort stack */
ldr r2, _armboot_start
sub r2, r2, #(CONFIG_SYS_MALLOC_LEN)
/* set base 2 words into abort stack */
- sub r2, r2, #(
CONFIG_SYS
_GBL_DATA_SIZE+8)
+ sub r2, r2, #(
GENERATED
_GBL_DATA_SIZE+8)
#else
ldr r2, IRQ_STACK_START_IN
#endif
#else
ldr r2, IRQ_STACK_START_IN
#endif
@@
-687,7
+688,7
@@
phy_last_jump:
/* move past malloc pool */
sub r13, r13, #(CONFIG_SYS_MALLOC_LEN)
/* move to reserved a couple spots for abort stack */
/* move past malloc pool */
sub r13, r13, #(CONFIG_SYS_MALLOC_LEN)
/* move to reserved a couple spots for abort stack */
- sub r13, r13, #(
CONFIG_SYS
_GBL_DATA_SIZE + 8)
+ sub r13, r13, #(
GENERATED
_GBL_DATA_SIZE + 8)
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif
@@
-721,7
+722,7
@@
phy_last_jump:
/* move past malloc pool */
sub r0, r0, #(CONFIG_SYS_MALLOC_LEN)
/* move past gbl and a couple spots for abort stack */
/* move past malloc pool */
sub r0, r0, #(CONFIG_SYS_MALLOC_LEN)
/* move past gbl and a couple spots for abort stack */
- sub r0, r0, #(
CONFIG_SYS
_GBL_DATA_SIZE + 8)
+ sub r0, r0, #(
GENERATED
_GBL_DATA_SIZE + 8)
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif
#else
ldr r13, IRQ_STACK_START_IN @ setup our mode stack
#endif