commit 25c9082ebb53d297d04a1cbb04c89c150c726f65
author Madhukar Pappireddy <madhukar.pappireddy@arm.com> Tue Nov 01 15:15:04 2022 +0100
committer TrustedFirmware Code Review <review@review.trustedfirmware.org> Tue Nov 01 15:15:04 2022 +0100
tree 9800a2a708ed38376be4653c416ed50f82ebe273
parent a2028380b37fd79f32c39ba205f00f3a8590647b
parent 82cb834f14a2ace7e0386ac977f5e4d4fef093cf

Merge "feat(imx8mn): add BL31 PIE support" into integration

plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c

diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
index 5adbddd..eff198d 100644
--- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
+++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
@@ -182,7 +182,7 @@
 }
 
 #define MAP_BL31_TOTAL										   \
-	MAP_REGION_FLAT(BL31_BASE, BL31_SIZE, MT_MEMORY | MT_RW | MT_SECURE)
+	MAP_REGION_FLAT(BL31_START, BL31_SIZE, MT_MEMORY | MT_RW | MT_SECURE)
 #define MAP_BL31_RO										   \
 	MAP_REGION_FLAT(BL_CODE_BASE, BL_CODE_END - BL_CODE_BASE, MT_MEMORY | MT_RO | MT_SECURE)
 #define MAP_COHERENT_MEM									   \

plat/imx/imx8m/imx8mn/platform.mk

diff --git a/plat/imx/imx8m/imx8mn/platform.mk b/plat/imx/imx8m/imx8mn/platform.mk
index c70f3a1..1c0ad4f 100644
--- a/plat/imx/imx8m/imx8mn/platform.mk
+++ b/plat/imx/imx8m/imx8mn/platform.mk
@@ -48,6 +48,7 @@
 				${IMX_GIC_SOURCES}				\
 				${XLAT_TABLES_LIB_SRCS}
 
+ENABLE_PIE		:=	1
 USE_COHERENT_MEM	:=	1
 RESET_TO_BL31		:=	1
 A53_DISABLE_NON_TEMPORAL_HINT := 0