diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 20:24:28 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 20:24:28 (GMT) |
| commit | cac423a730d3506154744485af1bbc1cd3a1e6a8 (patch) | |
| tree | 358b627972d9125de573c623f33e2da789f1de51 /arch/arm/cpu/armv7/lowlevel_init.S | |
| parent | c1b43ac7699640c8086bd73faa798bc9722d32c9 (diff) | |
| parent | 47c6ea076eb51e624f8744d93db5cd70b97dc25d (diff) | |
| download | u-boot-cac423a730d3506154744485af1bbc1cd3a1e6a8.tar.xz | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/lowlevel_init.S')
| -rw-r--r-- | arch/arm/cpu/armv7/lowlevel_init.S | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/lowlevel_init.S b/arch/arm/cpu/armv7/lowlevel_init.S index 0d45528..0a15aa4 100644 --- a/arch/arm/cpu/armv7/lowlevel_init.S +++ b/arch/arm/cpu/armv7/lowlevel_init.S @@ -37,7 +37,13 @@ ENTRY(lowlevel_init) */ ldr sp, =CONFIG_SYS_INIT_SP_ADDR bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ - +#ifdef CONFIG_SPL_BUILD + ldr r8, =gdata +#else + sub sp, #GD_SIZE + bic sp, sp, #7 + mov r8, sp +#endif /* * Save the old lr(passed in ip) and the current lr to stack */ |