plat: imx8m: Implement IMX_SIP_BUILDINFO

The IMX_SIP_BUILDINFO call was implemented for imx8qm and imx8qx but
it's also applicable to imx8m.

This fixes U-Boot not printing commit hash on 8m with upstream TF-A.

Change-Id: Idcfd9729eaaccf329c24e241da325f1f6cd3c880
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>

diff --git a/plat/imx/common/imx_sip_handler.c b/plat/imx/common/imx_sip_handler.c
index 4eabda7964f00e76b941b9ac72dcc5141d8c7190..89771cd6fad81591df5c02e33f8fad6c3db8b8c7 100644 (file)
--- a/plat/imx/common/imx_sip_handler.c
+++ b/plat/imx/common/imx_sip_handler.c
@@ -14,6 +14,8 @@
 #include <imx_sip_svc.h>
 #include <sci/sci.h>
 
+#if defined(PLAT_IMX8QM) || defined(PLAT_IMX8QX)
+
 #ifdef PLAT_IMX8QM
 const static int ap_cluster_index[PLATFORM_CLUSTER_COUNT] = {
        SC_R_A53, SC_R_A72,
@@ -139,6 +141,8 @@ int imx_misc_set_temp_handler(uint32_t smc_fid,
        return sc_misc_set_temp(ipc_handle, x1, x2, x3, x4);
 }
 
+#endif /* defined(PLAT_IMX8QM) || defined(PLAT_IMX8QX) */
+
 static uint64_t imx_get_commit_hash(u_register_t x2,
                    u_register_t x3,
                    u_register_t x4)

diff --git a/plat/imx/common/include/imx_sip_svc.h b/plat/imx/common/include/imx_sip_svc.h
index 648be3773cadffe00c465386ce37d7ea6ee9fedf..afe62d4a98a2028bbabbad2c18f0d4c06965c090 100644 (file)
--- a/plat/imx/common/include/imx_sip_svc.h
+++ b/plat/imx/common/include/imx_sip_svc.h
@@ -38,9 +38,9 @@ int imx_otp_handler(uint32_t smc_fid, void *handle,
 int imx_misc_set_temp_handler(uint32_t smc_fid, u_register_t x1,
                              u_register_t x2, u_register_t x3,
                              u_register_t x4);
+#endif
 uint64_t imx_buildinfo_handler(uint32_t smc_fid, u_register_t x1,
                               u_register_t x2, u_register_t x3,
                               u_register_t x4);
-#endif
 
 #endif /* __IMX_SIP_SVC_H__ */

diff --git a/plat/imx/imx8m/imx8mm/platform.mk b/plat/imx/imx8m/imx8mm/platform.mk
index d87624e26b0c559b004a325772a80b688b6d2158..9f9ba922c69867b4fb303daea44e74892a690d67 100644 (file)
--- a/plat/imx/imx8m/imx8mm/platform.mk
+++ b/plat/imx/imx8m/imx8mm/platform.mk
@@ -24,6 +24,8 @@ BL31_SOURCES          +=      plat/imx/common/imx8_helpers.S                  \
                                plat/imx/imx8m/imx8mm/imx8mm_psci.c             \
                                plat/imx/imx8m/imx8mm/gpc.c                     \
                                plat/imx/common/imx8_topology.c                 \
+                               plat/imx/common/imx_sip_handler.c               \
+                               plat/imx/common/imx_sip_svc.c                   \
                                plat/imx/common/imx_uart_console.S              \
                                lib/xlat_tables/aarch64/xlat_tables.c           \
                                lib/xlat_tables/xlat_tables_common.c            \

diff --git a/plat/imx/imx8m/imx8mq/platform.mk b/plat/imx/imx8m/imx8mq/platform.mk
index 89c2da0543b13402855be859fbb5b7dc24a0a57f..3152c7215a64f0f9b88a7410c5719536bd79b4fb 100644 (file)
--- a/plat/imx/imx8m/imx8mq/platform.mk
+++ b/plat/imx/imx8m/imx8mq/platform.mk
@@ -24,6 +24,8 @@ BL31_SOURCES          +=      plat/imx/common/imx8_helpers.S                  \
                                plat/imx/imx8m/imx8m_psci_common.c              \
                                plat/imx/imx8m/imx8mq/gpc.c                     \
                                plat/imx/common/imx8_topology.c                 \
+                               plat/imx/common/imx_sip_handler.c               \
+                               plat/imx/common/imx_sip_svc.c                   \
                                plat/imx/common/imx_uart_console.S              \
                                lib/xlat_tables/aarch64/xlat_tables.c           \
                                lib/xlat_tables/xlat_tables_common.c            \