summaryrefslogtreecommitdiff
path: root/plat/imx/imx8qxp/imx8qxp_bl31_setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'plat/imx/imx8qxp/imx8qxp_bl31_setup.c')
-rw-r--r--plat/imx/imx8qxp/imx8qxp_bl31_setup.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/plat/imx/imx8qxp/imx8qxp_bl31_setup.c b/plat/imx/imx8qxp/imx8qxp_bl31_setup.c
index 5b508f94..73bc834e 100644
--- a/plat/imx/imx8qxp/imx8qxp_bl31_setup.c
+++ b/plat/imx/imx8qxp/imx8qxp_bl31_setup.c
@@ -165,7 +165,7 @@ void imx8_partition_resources(void)
bool owned;
sc_faddr_t start, end, reg_end;
int i;
-#ifdef SPD_trusty
+#ifdef TEE_IMX8
sc_rm_mr_t mr_tee = 64;
bool mr_tee_atf_same = false;
sc_faddr_t reg_start;
@@ -205,7 +205,7 @@ void imx8_partition_resources(void)
if (BL31_BASE >= start && (BL31_LIMIT - 1) <= end) {
mr_record = mr; /* Record the mr for ATF running */
}
-#ifdef SPD_trusty
+#ifdef TEE_IMX8
else if (BL32_BASE >= start && (BL32_LIMIT -1) <= end) {
mr_tee = mr;
}
@@ -219,7 +219,7 @@ void imx8_partition_resources(void)
}
}
-#ifdef SPD_trusty
+#ifdef TEE_IMX8
if (mr_tee != 64) {
err = sc_rm_get_memreg_info(ipc_handle, mr_tee, &start, &end);
if (err) {
@@ -251,7 +251,7 @@ void imx8_partition_resources(void)
#endif
if (mr_record != 64) {
err = sc_rm_get_memreg_info(ipc_handle, mr_record, &start, &end);
-#ifdef SPD_trusty
+#ifdef TEE_IMX8
if (BL32_BASE >= start && (BL32_LIMIT - 1) <= end)
mr_tee_atf_same = true;
#endif
@@ -260,7 +260,7 @@ void imx8_partition_resources(void)
ERROR("Memreg get info failed, %u\n", mr_record);
} else {
if ((BL31_LIMIT - 1) < end) {
-#ifdef SPD_trusty
+#ifdef TEE_IMX8
if ((end > BL32_BASE) && mr_tee_atf_same)
reg_end = BL32_BASE - 1;
#endif
@@ -273,17 +273,17 @@ void imx8_partition_resources(void)
ERROR("Memreg assign failed, 0x%lx -- 0x%lx\n", (sc_faddr_t)BL31_LIMIT, reg_end);
}
}
-#ifdef SPD_trusty
+#ifdef TEE_IMX8
if (mr_tee_atf_same) {
if ((BL32_LIMIT - 1) < end) {
reg_start = BL32_LIMIT;
err = sc_rm_memreg_alloc(ipc_handle, &mr, reg_start, end);
if (err) {
- ERROR("sc_rm_memreg_alloc failed, 0x%lx -- 0x%lx\n", reg_start, reg_end);
+ ERROR("sc_rm_memreg_alloc failed, 0x%lx -- 0x%lx\n", reg_start, end);
} else {
err = sc_rm_assign_memreg(ipc_handle, os_part, mr);
if (err)
- ERROR("Memreg assign failed, 0x%lx -- 0x%lx\n", reg_start, reg_end);
+ ERROR("Memreg assign failed, 0x%lx -- 0x%lx\n", reg_start, end);
}
}
}
@@ -395,14 +395,16 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
*/
bl33_image_ep_info.pc = PLAT_NS_IMAGE_OFFSET;
bl33_image_ep_info.spsr = get_spsr_for_bl33_entry();
-#ifdef SPD_trusty
+#ifdef TEE_IMX8
SET_PARAM_HEAD(&bl32_image_ep_info, PARAM_EP, VERSION_1, 0);
SET_SECURITY_STATE(bl32_image_ep_info.h.attr, SECURE);
bl32_image_ep_info.pc = BL32_BASE;
bl32_image_ep_info.spsr = 0;
+#ifdef SPD_trusty
bl32_image_ep_info.args.arg0 = BL32_SIZE;
bl32_image_ep_info.args.arg1 = BL32_BASE;
#endif
+#endif
SET_SECURITY_STATE(bl33_image_ep_info.h.attr, NON_SECURE);
}
@@ -420,7 +422,7 @@ void bl31_plat_arch_setup(void)
mmap_add_region(IMX_REG_BASE, IMX_REG_BASE, IMX_REG_SIZE,
MT_DEVICE | MT_RW);
-#ifdef SPD_trusty
+#ifdef TEE_IMX8
mmap_add_region(BL32_BASE, BL32_BASE, BL32_SIZE, MT_MEMORY | MT_RW);
#endif