diff options
-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 |