diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-24 13:43:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-24 13:43:24 -0400 |
| commit | 3f6dcdb9cd4dbda226a1474f1e9398413e906b41 (patch) | |
| tree | fb3a7d7873e9c14a3733197e4cc028ce90827970 /arch/arm/lib | |
| parent | d8c1d5d5fb6eafbc532982125f006e49f2c40e71 (diff) | |
| parent | ab10d73d2fc13bd5baf5024e54ad92641d238bdb (diff) | |
| download | talos-obmc-uboot-3f6dcdb9cd4dbda226a1474f1e9398413e906b41.tar.gz talos-obmc-uboot-3f6dcdb9cd4dbda226a1474f1e9398413e906b41.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/crt0_64.S | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index 1654011432..bc9c53c308 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -61,7 +61,11 @@ ENTRY(_main) /* * Set up initial C runtime environment and call board_init_f(0). */ +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK) + ldr x0, =(CONFIG_SPL_STACK) +#else ldr x0, =(CONFIG_SYS_INIT_SP_ADDR) +#endif sub x18, x0, #GD_SIZE /* allocate one GD above SP */ bic x18, x18, #0x7 /* 8-byte alignment for GD */ zero_gd: @@ -77,6 +81,7 @@ zero_gd: mov x0, #0 bl board_init_f +#if !defined(CONFIG_SPL_BUILD) /* * Set up intermediate environment (new sp and gd) and call * relocate_code(addr_moni). Trick here is that we'll return @@ -119,4 +124,6 @@ clear_loop: /* NOTREACHED - board_init_r() does not return */ +#endif /* !CONFIG_SPL_BUILD */ + ENDPROC(_main) |
