diff options
| author | Tom Rini <trini@ti.com> | 2014-11-24 12:01:48 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-24 12:01:48 -0500 |
| commit | 1739564e753bc3a8097f8937a3cbe738bdaaed5d (patch) | |
| tree | 56fe759e62f129dc055b6f6a22f299f6c8b5cdde /arch/arm/lib/crt0.S | |
| parent | 746667f1e56bf08d03e66a178df3c4f4f6c806e1 (diff) | |
| parent | 17b28edb37a33d0c89089faf36e4edd7084f65fa (diff) | |
Merge git://git.denx.de/u-boot-dm
Conflicts:
drivers/serial/serial-uclass.c
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/arm/lib/crt0.S')
| -rw-r--r-- | arch/arm/lib/crt0.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index 29cdad0f70..823b233bc8 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -78,7 +78,7 @@ clr_gd: strlo r0, [r1] /* clear 32-bit GD word */ addlo r1, r1, #4 /* move to next */ blo clr_gd -#if defined(CONFIG_SYS_MALLOC_F_LEN) && !defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_SYS_MALLOC_F_LEN) sub sp, sp, #CONFIG_SYS_MALLOC_F_LEN str sp, [r9, #GD_MALLOC_BASE] #endif |