[PATCH 2/3] ARM: i.MX8M: rename imx8m_atf_load_bl31 for clarity

Ahmad Fatoum a.fatoum at pengutronix.de
Mon Aug 15 05:55:50 PDT 2022


The functions imx8mX_load_and_start_image_via_tfa() suggest that loading
does not involve starting. The functions imx8mX_atf_load_bl31()
relocates bl31 and starts it, but doesn't actually load it (either from
boot medium or via get_builtin_firmware).

We won't rename these yet to avoid breaking out-of-tree boards,
but we can at least rename the static imx8mX_atf_load_bl31 to reflect
that it starts bl31.

Signed-off-by: Ahmad Fatoum <a.fatoum at pengutronix.de>
---
 arch/arm/mach-imx/atf.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-imx/atf.c b/arch/arm/mach-imx/atf.c
index df23dbfc0e5a..675e90792a32 100644
--- a/arch/arm/mach-imx/atf.c
+++ b/arch/arm/mach-imx/atf.c
@@ -35,7 +35,7 @@
  *
  */
 
-static __noreturn void imx8m_atf_load_bl31(const void *fw, size_t fw_size, void *atf_dest)
+static __noreturn void imx8m_atf_start_bl31(const void *fw, size_t fw_size, void *atf_dest)
 {
 	void __noreturn (*bl31)(void) = atf_dest;
 
@@ -52,22 +52,22 @@ static __noreturn void imx8m_atf_load_bl31(const void *fw, size_t fw_size, void
 
 __noreturn void imx8mm_atf_load_bl31(const void *fw, size_t fw_size)
 {
-	imx8m_atf_load_bl31(fw, fw_size, (void *)MX8MM_ATF_BL31_BASE_ADDR);
+	imx8m_atf_start_bl31(fw, fw_size, (void *)MX8MM_ATF_BL31_BASE_ADDR);
 }
 
 __noreturn void imx8mn_atf_load_bl31(const void *fw, size_t fw_size)
 {
-	imx8m_atf_load_bl31(fw, fw_size, (void *)MX8MN_ATF_BL31_BASE_ADDR);
+	imx8m_atf_start_bl31(fw, fw_size, (void *)MX8MN_ATF_BL31_BASE_ADDR);
 }
 
 __noreturn void imx8mp_atf_load_bl31(const void *fw, size_t fw_size)
 {
-	imx8m_atf_load_bl31(fw, fw_size, (void *)MX8MP_ATF_BL31_BASE_ADDR);
+	imx8m_atf_start_bl31(fw, fw_size, (void *)MX8MP_ATF_BL31_BASE_ADDR);
 }
 
 __noreturn void imx8mq_atf_load_bl31(const void *fw, size_t fw_size)
 {
-	imx8m_atf_load_bl31(fw, fw_size, (void *)MX8MQ_ATF_BL31_BASE_ADDR);
+	imx8m_atf_start_bl31(fw, fw_size, (void *)MX8MQ_ATF_BL31_BASE_ADDR);
 }
 
 __noreturn void imx8mm_load_and_start_image_via_tfa(void)
-- 
2.30.2




More information about the barebox mailing list