diff options
| author | Ji Luo <ji.luo@nxp.com> | 2019-08-05 15:32:05 +0800 |
|---|---|---|
| committer | Ji Luo <ji.luo@nxp.com> | 2020-03-09 10:11:45 +0800 |
| commit | 1a627ddc1d8a9f4551bb646365cf1949e5285361 (patch) | |
| tree | 13182d9ca0ccc0d5a24a054b4366aac5f283b231 | |
| parent | 9c34419c70312a03a8a98189c6490c4a41e3e8d4 (diff) | |
MA-15289-4 Integrate SCFW API lib to trusty
Open the power domain of MU4 and assign it to secure
world so trusty can call the SCFW API.
Test: Get SCFW and SECO-FW by trusty.
Change-Id: I6188f905426fd66072346089505fb1945e4362e3
Signed-off-by: Ji Luo <ji.luo@nxp.com>
(cherry-picked from commit 4dd8919a805336c6df8a791f238e8da1830dfe7b)
| -rw-r--r-- | plat/imx/imx8qm/imx8qm_bl31_setup.c | 1 | ||||
| -rw-r--r-- | plat/imx/imx8qm/include/sec_rsrc.h | 3 | ||||
| -rw-r--r-- | plat/imx/imx8qx/imx8qx_bl31_setup.c | 1 | ||||
| -rw-r--r-- | plat/imx/imx8qx/include/sec_rsrc.h | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/plat/imx/imx8qm/imx8qm_bl31_setup.c b/plat/imx/imx8qm/imx8qm_bl31_setup.c index dd1f107f..2634c889 100644 --- a/plat/imx/imx8qm/imx8qm_bl31_setup.c +++ b/plat/imx/imx8qm/imx8qm_bl31_setup.c @@ -443,6 +443,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, sc_pm_set_resource_power_mode(ipc_handle, SC_R_CAAM_JR2_OUT, SC_PM_PW_MODE_ON); sc_pm_set_resource_power_mode(ipc_handle, SC_R_CAAM_JR3, SC_PM_PW_MODE_ON); sc_pm_set_resource_power_mode(ipc_handle, SC_R_CAAM_JR3_OUT, SC_PM_PW_MODE_ON); + sc_pm_set_resource_power_mode(ipc_handle, SC_R_MU_4A, SC_PM_PW_MODE_ON); #endif bl33_image_ep_info.pc = PLAT_NS_IMAGE_OFFSET; diff --git a/plat/imx/imx8qm/include/sec_rsrc.h b/plat/imx/imx8qm/include/sec_rsrc.h index f2d71560..23487de4 100644 --- a/plat/imx/imx8qm/include/sec_rsrc.h +++ b/plat/imx/imx8qm/include/sec_rsrc.h @@ -24,7 +24,8 @@ sc_rsrc_t secure_rsrcs[] = { SC_R_CAAM_JR2, SC_R_CAAM_JR2_OUT, SC_R_CAAM_JR3, - SC_R_CAAM_JR3_OUT + SC_R_CAAM_JR3_OUT, + SC_R_MU_4A #endif }; diff --git a/plat/imx/imx8qx/imx8qx_bl31_setup.c b/plat/imx/imx8qx/imx8qx_bl31_setup.c index e15b9b38..4396846e 100644 --- a/plat/imx/imx8qx/imx8qx_bl31_setup.c +++ b/plat/imx/imx8qx/imx8qx_bl31_setup.c @@ -419,6 +419,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, sc_pm_set_resource_power_mode(ipc_handle, SC_R_CAAM_JR2_OUT, SC_PM_PW_MODE_ON); sc_pm_set_resource_power_mode(ipc_handle, SC_R_CAAM_JR3, SC_PM_PW_MODE_ON); sc_pm_set_resource_power_mode(ipc_handle, SC_R_CAAM_JR3_OUT, SC_PM_PW_MODE_ON); + sc_pm_set_resource_power_mode(ipc_handle, SC_R_MU_4A, SC_PM_PW_MODE_ON); #endif bl33_image_ep_info.pc = PLAT_NS_IMAGE_OFFSET; diff --git a/plat/imx/imx8qx/include/sec_rsrc.h b/plat/imx/imx8qx/include/sec_rsrc.h index 8a9a817f..d9caadc3 100644 --- a/plat/imx/imx8qx/include/sec_rsrc.h +++ b/plat/imx/imx8qx/include/sec_rsrc.h @@ -20,7 +20,8 @@ sc_rsrc_t secure_rsrcs[] = { SC_R_CAAM_JR2, SC_R_CAAM_JR2_OUT, SC_R_CAAM_JR3, - SC_R_CAAM_JR3_OUT + SC_R_CAAM_JR3_OUT, + SC_R_MU_4A #endif }; |