Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index 3587ad681297e980ed65fca650314c09474c5b20..af0c9ad6bd6c676e590a783438e084fccb2ccc39 100644 (file)
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -1,17 +1,21 @@
+// 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 <init.h>
+#include <log.h>
 #include <spl.h>
 #include <image.h>
+#include <asm/cache.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 */
@@ -44,22 +48,31 @@ void __weak board_init_f(ulong dummy)
 /*
  * This function jumps to an image with argument. Normally an FDT or ATAGS
  * image.
- * arg: Pointer to paramter image in RAM
  */
 #ifdef CONFIG_SPL_OS_BOOT
-void __noreturn jump_to_image_linux(void *arg)
+#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;
 #ifdef CONFIG_MACH_TYPE
        machid = CONFIG_MACH_TYPE;
 #endif
 
-       debug("Entering kernel arg pointer: 0x%p\n", arg);
+       debug("Entering kernel arg pointer: 0x%p\n", spl_image->arg);
        typedef void (*image_entry_arg_t)(int, int, void *)
                __attribute__ ((noreturn));
        image_entry_arg_t image_entry =
-               (image_entry_arg_t)(uintptr_t) spl_image.entry_point;
+               (image_entry_arg_t)(uintptr_t) spl_image->entry_point;
        cleanup_before_linux();
-       image_entry(0, machid, arg);
+       image_entry(0, machid, spl_image->arg);
 }
+#endif /* CONFIG_ARM64 */
 #endif