diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-02-18 10:52:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-18 10:52:23 +0000 |
| commit | fa233ac9d435905d2717a9880cfb3a1671e37134 (patch) | |
| tree | 27b9d776ccfe2ad260c734879a4b825d64df0446 | |
| parent | ba2d7f927ee32b342e3bcdbff30eb371928476db (diff) | |
| parent | 819dcd7c4c4a1989ce2bfb8ee9a1a1c0566506ad (diff) | |
Merge pull request #1824 from antonio-nino-diaz-arm/an/move-dyn-xlat
fvp: trusty: Move dynamic xlat enable to platform
| -rw-r--r-- | plat/arm/board/fvp/platform.mk | 5 | ||||
| -rw-r--r-- | 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 f79ac466..42a9095d 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 4f0c2947..43b80bba 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 |