global: Migrate CONFIG_SYS_FSL* symbols to the CFG_SYS namespace

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

diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index 27d6682..b138974 100644 (file)
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -1,16 +1,20 @@
+// 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 <asm/global_data.h>
 #include <linux/compiler.h>
 #include <asm/mach-types.h>
 
@@ -22,7 +26,7 @@ DECLARE_GLOBAL_DATA_PTR;
  * WARNING: This is going away very soon. Don't use it and don't submit
  * pafches that rely on it. The global_data area is set up in crt0.S.
  */
-gd_t gdata __attribute__ ((section(".data")));
+gd_t gdata __section(".data");
 #endif
 
 /*
@@ -46,7 +50,16 @@ void __weak board_init_f(ulong dummy)
  * This function jumps to an image with argument. Normally an FDT or ATAGS
  * image.
  */
-#ifdef CONFIG_SPL_OS_BOOT
+#if CONFIG_IS_ENABLED(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 +75,16 @@ 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
+
+#if CONFIG_IS_ENABLED(OPTEE_IMAGE)
+void __noreturn jump_to_image_optee(struct spl_image_info *spl_image)
+{
+       /* flush and turn off caches before jumping to OPTEE */
+       cleanup_before_linux();
+
+       spl_optee_entry(NULL, NULL, spl_image->fdt_addr,
+                       (void *)spl_image->entry_point);
+}
 #endif