Skip to content

GitLab

Commit 18113ba7 authored by Antonio Niño Díaz's avatar Antonio Niño Díaz Committed by TrustedFirmware Code Review
Browse files

Merge "plat: imx8m: Implement IMX_SIP_BUILDINFO" into integration

parents 6079e447 950d05f7
master v2.5 v2.5-rc1 v2.5-rc0 v2.4 v2.4-rc2 v2.4-rc1 v2.4-rc0 v2.3 v2.3-rc2 v2.3-rc1 v2.3-rc0 v2.2 v2.2-rc2 v2.2-rc1 v2.2-rc0 arm_cca_v0.2 arm_cca_v0.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 9 additions and 1 deletion
+9 -1
plat/imx/common/imx_sip_handler.c
View file @ 18113ba7
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#include <imx_sip_svc.h> #include <imx_sip_svc.h>
#include <sci/sci.h> #include <sci/sci.h>
#if defined(PLAT_IMX8QM) || defined(PLAT_IMX8QX)
#ifdef PLAT_IMX8QM #ifdef PLAT_IMX8QM
const static int ap_cluster_index[PLATFORM_CLUSTER_COUNT] = { const static int ap_cluster_index[PLATFORM_CLUSTER_COUNT] = {
SC_R_A53, SC_R_A72, SC_R_A53, SC_R_A72,
...@@ -139,6 +141,8 @@ int imx_misc_set_temp_handler(uint32_t smc_fid, ...@@ -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); 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, static uint64_t imx_get_commit_hash(u_register_t x2,
u_register_t x3, u_register_t x3,
u_register_t x4) u_register_t x4)
......
plat/imx/common/include/imx_sip_svc.h
View file @ 18113ba7
...@@ -38,9 +38,9 @@ int imx_otp_handler(uint32_t smc_fid, void *handle, ...@@ -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, 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 x2, u_register_t x3,
u_register_t x4); u_register_t x4);
#endif
uint64_t imx_buildinfo_handler(uint32_t smc_fid, u_register_t x1, uint64_t imx_buildinfo_handler(uint32_t smc_fid, u_register_t x1,
u_register_t x2, u_register_t x3, u_register_t x2, u_register_t x3,
u_register_t x4); u_register_t x4);
#endif
#endif /* __IMX_SIP_SVC_H__ */ #endif /* __IMX_SIP_SVC_H__ */
plat/imx/imx8m/imx8mm/platform.mk
View file @ 18113ba7
...@@ -24,6 +24,8 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \ ...@@ -24,6 +24,8 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \
plat/imx/imx8m/imx8mm/imx8mm_psci.c \ plat/imx/imx8m/imx8mm/imx8mm_psci.c \
plat/imx/imx8m/imx8mm/gpc.c \ plat/imx/imx8m/imx8mm/gpc.c \
plat/imx/common/imx8_topology.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 \ plat/imx/common/imx_uart_console.S \
lib/xlat_tables/aarch64/xlat_tables.c \ lib/xlat_tables/aarch64/xlat_tables.c \
lib/xlat_tables/xlat_tables_common.c \ lib/xlat_tables/xlat_tables_common.c \
......
plat/imx/imx8m/imx8mq/platform.mk
View file @ 18113ba7
...@@ -24,6 +24,8 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \ ...@@ -24,6 +24,8 @@ BL31_SOURCES += plat/imx/common/imx8_helpers.S \
plat/imx/imx8m/imx8m_psci_common.c \ plat/imx/imx8m/imx8m_psci_common.c \
plat/imx/imx8m/imx8mq/gpc.c \ plat/imx/imx8m/imx8mq/gpc.c \
plat/imx/common/imx8_topology.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 \ plat/imx/common/imx_uart_console.S \
lib/xlat_tables/aarch64/xlat_tables.c \ lib/xlat_tables/aarch64/xlat_tables.c \
lib/xlat_tables/xlat_tables_common.c \ lib/xlat_tables/xlat_tables_common.c \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment