spl: add __noreturn attribute to spl_invoke_opensbi function

spl_invoke_opensbi function is not returned to SPL. Thus, we need to
set __noreturn function attribute.

Signed-off-by: Chanho Park <chanho61.park@samsung.com>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>

diff --git a/common/spl/spl_opensbi.c b/common/spl/spl_opensbi.c
index b0f40076c34533bdfa18bc2ae95cc9aead7ce6b4..e2aaa460468c9c92502567916421799945cf3408 100644 (file)
--- a/common/spl/spl_opensbi.c
+++ b/common/spl/spl_opensbi.c
@@ -43,11 +43,12 @@ static int spl_opensbi_find_uboot_node(void *blob, int *uboot_node)
        return -ENODEV;
 }
 
-void spl_invoke_opensbi(struct spl_image_info *spl_image)
+void __noreturn spl_invoke_opensbi(struct spl_image_info *spl_image)
 {
        int ret, uboot_node;
        ulong uboot_entry;
-       void (*opensbi_entry)(ulong hartid, ulong dtb, ulong info);
+       typedef void __noreturn (*opensbi_entry_t)(ulong hartid, ulong dtb, ulong info);
+       opensbi_entry_t opensbi_entry;
 
        if (!spl_image->fdt_addr) {
                pr_err("No device tree specified in SPL image\n");
@@ -74,7 +75,7 @@ void spl_invoke_opensbi(struct spl_image_info *spl_image)
        opensbi_info.options = CONFIG_SPL_OPENSBI_SCRATCH_OPTIONS;
        opensbi_info.boot_hart = gd->arch.boot_hart;
 
-       opensbi_entry = (void (*)(ulong, ulong, ulong))spl_image->entry_point;
+       opensbi_entry = (opensbi_entry_t)spl_image->entry_point;
        invalidate_icache_all();
 
 #ifdef CONFIG_SPL_SMP

diff --git a/include/spl.h b/include/spl.h
index 92bcaa90a4afe4b3d51217d27b7173feeef74b03..93e906431e7dc093d5d78e8dd1de1fa55c2bcccb 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -862,7 +862,7 @@ void __noreturn spl_optee_entry(void *arg0, void *arg1, void *arg2, void *arg3);
 /**
  * spl_invoke_opensbi - boot using a RISC-V OpenSBI image
  */
-void spl_invoke_opensbi(struct spl_image_info *spl_image);
+void __noreturn spl_invoke_opensbi(struct spl_image_info *spl_image);
 
 /**
  * board_return_to_bootrom - allow for boards to continue with the boot ROM