spl_invoke_atf function will not be returned to SPL. Thus, we need to set __noreturn function attribute to the function.
Signed-off-by: Chanho Park chanho61.park@samsung.com --- common/spl/spl_atf.c | 8 ++++---- include/spl.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c index 2c10252834f6..3bdd013a35fe 100644 --- a/common/spl/spl_atf.c +++ b/common/spl/spl_atf.c @@ -187,10 +187,10 @@ static inline void raw_write_daif(unsigned int daif) __asm__ __volatile__("msr DAIF, %x0\n\t" : : "r" (daif) : "memory"); }
-typedef void (*atf_entry_t)(struct bl31_params *params, void *plat_params); +typedef void __noreturn (*atf_entry_t)(struct bl31_params *params, void *plat_params);
-static void bl31_entry(uintptr_t bl31_entry, uintptr_t bl32_entry, - uintptr_t bl33_entry, uintptr_t fdt_addr) +static void __noreturn bl31_entry(uintptr_t bl31_entry, uintptr_t bl32_entry, + uintptr_t bl33_entry, uintptr_t fdt_addr) { atf_entry_t atf_entry = (atf_entry_t)bl31_entry; void *bl31_params; @@ -251,7 +251,7 @@ uintptr_t spl_fit_images_get_entry(void *blob, int node) return val; }
-void spl_invoke_atf(struct spl_image_info *spl_image) +void __noreturn spl_invoke_atf(struct spl_image_info *spl_image) { uintptr_t bl32_entry = 0; uintptr_t bl33_entry = CONFIG_TEXT_BASE; diff --git a/include/spl.h b/include/spl.h index 93e906431e7d..01ed8f58afd8 100644 --- a/include/spl.h +++ b/include/spl.h @@ -770,7 +770,7 @@ int spl_ymodem_load_image(struct spl_image_info *spl_image, /** * spl_invoke_atf - boot using an ARM trusted firmware image */ -void spl_invoke_atf(struct spl_image_info *spl_image); +void __noreturn spl_invoke_atf(struct spl_image_info *spl_image);
/** * bl2_plat_get_bl31_params() - return params for bl31.