diff options
| author | Tom Rini <trini@konsulko.com> | 2017-10-12 13:36:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-10-12 13:36:58 -0400 |
| commit | 26f9184e094541b672f83f23652e2e737d5d0729 (patch) | |
| tree | 691d6cb0965ae8fb01f8be9694076176666f8ab3 /arch/arm/lib | |
| parent | e11d2fff73b5c0e04027b55020a0a56d9dc72aa4 (diff) | |
| parent | 23af484b0156baaafd578222d73513418df78f09 (diff) | |
| download | u-boot-26f9184e094541b672f83f23652e2e737d5d0729.tar.gz u-boot-26f9184e094541b672f83f23652e2e737d5d0729.tar.xz u-boot-26f9184e094541b672f83f23652e2e737d5d0729.zip | |
Merge git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/spl.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index 27d6682c0b..ab5d2277aa 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -7,6 +7,7 @@ * * SPDX-License-Identifier: GPL-2.0+ */ + #include <common.h> #include <config.h> #include <spl.h> @@ -47,6 +48,15 @@ void __weak board_init_f(ulong dummy) * image. */ #ifdef CONFIG_SPL_OS_BOOT +#ifdef CONFIG_ARM64 +void __noreturn jump_to_image_linux(struct spl_image_info *spl_image) +{ + debug("Entering kernel arg pointer: 0x%p\n", spl_image->arg); + cleanup_before_linux(); + armv8_switch_to_el2((u64)spl_image->arg, 0, 0, 0, + spl_image->entry_point, ES_TO_AARCH64); +} +#else void __noreturn jump_to_image_linux(struct spl_image_info *spl_image) { unsigned long machid = 0xffffffff; @@ -62,4 +72,5 @@ void __noreturn jump_to_image_linux(struct spl_image_info *spl_image) cleanup_before_linux(); image_entry(0, machid, spl_image->arg); } +#endif /* CONFIG_ARM64 */ #endif |