diff options
| author | Tom Rini <[email protected]> | 2017-12-18 18:39:18 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2017-12-18 18:39:18 -0500 |
| commit | eeab579aa8d76b96afbd0862029d4452943bafbe (patch) | |
| tree | 446ba45437bfa80ab191c4137ad3c5a7c86c720c /arch/arm/include | |
| parent | 1a3fc354b50b2a86361964b6d695ce26058248f5 (diff) | |
| parent | cbe503793aba03c19b8d21e0a6e344afe624e2d6 (diff) | |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-rockchip/boot0.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-rockchip/boot0.h b/arch/arm/include/asm/arch-rockchip/boot0.h index af3a733e984..5d35c35c285 100644 --- a/arch/arm/include/asm/arch-rockchip/boot0.h +++ b/arch/arm/include/asm/arch-rockchip/boot0.h @@ -39,7 +39,12 @@ entry_counter: .word 0 #endif + +#if (defined(CONFIG_SPL_BUILD) || defined(CONFIG_ARM64)) + /* U-Boot proper of armv7 do not need this */ b reset +#endif + #if !defined(CONFIG_ARM64) /* * For armv7, the addr '_start' will used as vector start address @@ -50,6 +55,6 @@ _start: ARM_VECTORS #endif -#if defined(CONFIG_ROCKCHIP_RK3399) && defined(CONFIG_SPL_BUILD) +#if defined(CONFIG_SPL_BUILD) && (CONFIG_ROCKCHIP_SPL_RESERVE_IRAM > 0) .space CONFIG_ROCKCHIP_SPL_RESERVE_IRAM /* space for the ATF data */ #endif |