summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Masse <olivier.masse@nxp.com>2021-02-18 14:35:53 +0100
committerlei zhou <lei.zhou@linaro.org>2022-11-28 16:11:28 -0500
commitbf8ce1c591e94b2633bb9f3f26c92867e54f0002 (patch)
treeb6a2593c7c14090e5027cc26ac63daa56d3ddb53
parent76111c285494a6d4f8e1b5e4ca8858780739d135 (diff)
MMIOT-675: BL32_BASE set to 0x56000000
Signed-off-by: Olivier Masse <olivier.masse@nxp.com>
-rw-r--r--plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c10
-rw-r--r--plat/imx/imx8m/imx8mq/platform.mk2
2 files changed, 3 insertions, 9 deletions
diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
index 9f14c111a..698e1e455 100644
--- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
+++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
@@ -112,11 +112,11 @@ static void imx8mq_soc_info_init(void)
#ifdef CFG_RDC_SECURE_DATA_PATH
#if defined(DECRYPTED_BUFFER_START) && defined(DECRYPTED_BUFFER_LEN)
-#define DECRYPTED_BUFFER_END DECRYPTED_BUFFER_START + DECRYPTED_BUFFER_LEN
+#define DECRYPTED_BUFFER_END (uint32_t)DECRYPTED_BUFFER_START + DECRYPTED_BUFFER_LEN
#endif
#if defined(DECODED_BUFFER_START) && defined(DECODED_BUFFER_LEN)
-#define DECODED_BUFFER_END DECODED_BUFFER_START + DECODED_BUFFER_LEN
+#define DECODED_BUFFER_END (uint32_t)DECODED_BUFFER_START + DECODED_BUFFER_LEN
#endif
#endif // CFG_RDC_SECURE_DATA_PATH
@@ -285,14 +285,8 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
bl32_image_ep_info.spsr = 0;
/* Pass TEE base and size to bl33 */
-#if defined(DECRYPTED_BUFFER_START) && defined(DECODED_BUFFER_LEN) && defined(DECRYPTED_BUFFER_LEN)
- /* Integrate SDP */
- bl33_image_ep_info.args.arg1 = DECRYPTED_BUFFER_START;
- bl33_image_ep_info.args.arg2 = BL32_SIZE + DECRYPTED_BUFFER_LEN + DECODED_BUFFER_LEN;
-#else
bl33_image_ep_info.args.arg1 = BL32_BASE;
bl33_image_ep_info.args.arg2 = BL32_SIZE;
-#endif
#ifdef SPD_trusty
bl32_image_ep_info.args.arg0 = BL32_SIZE;
diff --git a/plat/imx/imx8m/imx8mq/platform.mk b/plat/imx/imx8m/imx8mq/platform.mk
index 5438689ba..cab90af8d 100644
--- a/plat/imx/imx8m/imx8mq/platform.mk
+++ b/plat/imx/imx8m/imx8mq/platform.mk
@@ -76,7 +76,7 @@ ERRATA_A53_835769 := 1
ERRATA_A53_843419 := 1
ERRATA_A53_855873 := 1
-BL32_BASE ?= 0xfe000000
+BL32_BASE ?= 0x56000000
$(eval $(call add_define,BL32_BASE))
BL32_SIZE ?= 0x2000000