summaryrefslogtreecommitdiff
path: root/arch/arm/lib
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-10-26 09:31:48 -0400
committerTom Rini <trini@konsulko.com>2021-10-26 09:33:17 -0400
commit75e33b378b3c81f1be1a8fa3815390b39fddda57 (patch)
treee414daf1db351b5857633b89ceb784a5e2eaf4c3 /arch/arm/lib
parent397b35f09794e40d62d5e4f53992e2a711dc8be1 (diff)
parentca341e98c8273e2ee74c489d6274740824c7b239 (diff)
Merge branch '2021-10-25-assorted-updates'
- Allow redundant environment on the eMMC HW boot partitions - Use LMB in "loads" - env, dfu + spi, OPTEE bugfixes
Diffstat (limited to 'arch/arm/lib')
-rw-r--r--arch/arm/lib/spl.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index 8e2bdf35365..4f9b84ba344 100644
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -77,3 +77,14 @@ void __noreturn jump_to_image_linux(struct spl_image_info *spl_image)
}
#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