SPDX: Convert all of our single license tags to Linux Kernel style

[u-boot] / arch / arm / lib / spl.c

diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index 8ff2c5065ddeea7bb8d77b3c60bffe5474980da1..33cc76ba3de3cb2d94dff85fce1cbbe9ff600814 100644 (file)
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -1,17 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2010-2012
  * Texas Instruments, <www.ti.com>
  *
  * Aneesh V <aneesh@ti.com>
  * Tom Rini <trini@ti.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
+
 #include <common.h>
 #include <config.h>
 #include <spl.h>
 #include <image.h>
 #include <linux/compiler.h>
+#include <asm/mach-types.h>
 
 #ifndef CONFIG_SPL_DM
 /* Pointer to as well as the global data structure for SPL */
@@ -46,6 +47,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;
@@ -61,4 +71,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