commit 4c73585b539e2d75a0252f861d46b007522c9960
author Antonio Niño Díaz <antonio.ninodiaz@arm.com> Mon Feb 18 10:52:23 2019 +0000
committer GitHub <noreply@github.com> Mon Feb 18 10:52:23 2019 +0000
tree 27b9d776ccfe2ad260c734879a4b825d64df0446
parent 3259139970470d0e60f9ff456c6751b59458be33
parent 60ef675270675b4af54e426bdc75fd43a2fb8f73

Merge pull request #1824 from antonio-nino-diaz-arm/an/move-dyn-xlat

fvp: trusty: Move dynamic xlat enable to platform

plat/arm/board/fvp/platform.mk

diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk
index f79ac46..42a9095 100644
--- a/plat/arm/board/fvp/platform.mk
+++ b/plat/arm/board/fvp/platform.mk
@@ -236,7 +236,7 @@
     ifeq (${RESET_TO_SP_MIN},1)
         BL32_CFLAGS	+=	-DPLAT_XLAT_TABLES_DYNAMIC=1
     endif
-else
+else # if AArch64
     ifeq (${RESET_TO_BL31},1)
         BL31_CFLAGS	+=	-DPLAT_XLAT_TABLES_DYNAMIC=1
     endif
@@ -245,6 +245,9 @@
             BL31_CFLAGS	+=	-DPLAT_XLAT_TABLES_DYNAMIC=1
         endif
     endif
+    ifeq (${SPD},trusty)
+        BL31_CFLAGS	+=	-DPLAT_XLAT_TABLES_DYNAMIC=1
+    endif
 endif
 
 # Add support for platform supplied linker script for BL31 build

services/spd/trusty/trusty.mk

diff --git a/services/spd/trusty/trusty.mk b/services/spd/trusty/trusty.mk
index 4f0c294..43b80bb 100644
--- a/services/spd/trusty/trusty.mk
+++ b/services/spd/trusty/trusty.mk
@@ -13,8 +13,6 @@
 SPD_SOURCES		+=	services/spd/trusty/generic-arm64-smcall.c
 endif
 
-BL31_CFLAGS	+=		-DPLAT_XLAT_TABLES_DYNAMIC=1
-
 NEED_BL32		:=	yes
 
 CTX_INCLUDE_FPREGS	:=	1