From 819dcd7c4c4a1989ce2bfb8ee9a1a1c0566506ad Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Tue, 12 Feb 2019 13:32:03 +0000 Subject: [PATCH] fvp: trusty: Move dynamic xlat enable to platform Rather than letting the Trusty makefile set the option to enable dynamic translation tables, make platforms do it themselves. This also allows platforms to replace the implementation of the translation tables library as long as they use the same function prototypes. Change-Id: Ia60904f61709ac323addcb57f7a83391d9e21cd0 Signed-off-by: Antonio Nino Diaz --- plat/arm/board/fvp/platform.mk | 5 ++++- services/spd/trusty/trusty.mk | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk index f79ac466b..42a9095d9 100644 --- a/plat/arm/board/fvp/platform.mk +++ b/plat/arm/board/fvp/platform.mk @@ -236,7 +236,7 @@ ifeq (${ARCH},aarch32) 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 @@ else 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 diff --git a/services/spd/trusty/trusty.mk b/services/spd/trusty/trusty.mk index 4f0c29476..43b80bba7 100644 --- a/services/spd/trusty/trusty.mk +++ b/services/spd/trusty/trusty.mk @@ -13,8 +13,6 @@ ifeq (${TRUSTY_SPD_WITH_GENERIC_SERVICES},1) SPD_SOURCES += services/spd/trusty/generic-arm64-smcall.c endif -BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 - NEED_BL32 := yes CTX_INCLUDE_FPREGS := 1 -- GitLab