diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-09 07:12:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-09 12:36:17 -0400 |
| commit | f30f268a07b0c9e4418366debc9ad0100a47cea4 (patch) | |
| tree | 858fac88a11004fde4c9eaa4efca5cb0763ce631 /arch/arm/lib/crt0.S | |
| parent | 062aceb8bf4f47719b8035fd3d02dc1515caa63f (diff) | |
| parent | c661c059b9a507baa1704c03f29ff2f79bae2ce2 (diff) | |
Merge tag 'rockchip-for-v2019.07-rc1' of git://git.denx.de/u-boot-rockchip
Improvements and new features:
- split more rockchip pinctrl_core feature into per SoC
- enable TPL for evb-rk3399 board
- enable TPL/SPL for evb-px5 board
- enable TPL and OP-TEE support for evb-rk3229
- update fix in arm common assembly start code for rockchip header file
- update default SPL_FIT_GENERATOR for rockchip
- rk3399 boards update to use '-u-boot.dtsi'
- add new rk3399 boards: Nanopi M4, Nanopc T4
- enable sound for chromebook_minnie
Diffstat (limited to 'arch/arm/lib/crt0.S')
| -rw-r--r-- | arch/arm/lib/crt0.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index fe312db690..30fba20e1b 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -67,7 +67,9 @@ ENTRY(_main) * Set up initial C runtime environment and call board_init_f(0). */ -#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK) +#if defined(CONFIG_TPL_BUILD) && defined(CONFIG_TPL_NEEDS_SEPARATE_STACK) + ldr r0, =(CONFIG_TPL_STACK) +#elif defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK) ldr r0, =(CONFIG_SPL_STACK) #else ldr r0, =(CONFIG_SYS_INIT_SP_ADDR) |