diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-05-10 08:51:29 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-05-10 08:51:29 +0000 |
| commit | 18113ba7f512444a68c4882c76b9f149135a5343 (patch) | |
| tree | 4e4fd40726d8668efbe237b0fe6063b5de5203aa | |
| parent | 6079e44743de4dda0f8c392acecaaf3d80e5b367 (diff) | |
| parent | 950d05f752e0d35c45a7123ed1538efaabd8c37c (diff) | |
Merge "plat: imx8m: Implement IMX_SIP_BUILDINFO" into integration
| -rw-r--r-- | plat/imx/common/imx_sip_handler.c | 4 | ||||
| -rw-r--r-- | plat/imx/common/include/imx_sip_svc.h | 2 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mm/platform.mk | 2 | ||||
| -rw-r--r-- | plat/imx/imx8m/imx8mq/platform.mk | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/plat/imx/common/imx_sip_handler.c b/plat/imx/common/imx_sip_handler.c index 4eabda79..89771cd6 100644 --- 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 648be377..afe62d4a 100644 --- 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 d87624e2..9f9ba922 100644 --- 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 89c2da05..3152c721 100644 --- 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 \ |