andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

fvp: trusty: Move dynamic xlat enable to platform
This commit is contained in:
Antonio Niño Díaz 2019-02-18 10:52:23 +00:00 committed by GitHub
parent ba2d7f927e 819dcd7c4c
commit fa233ac9d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plat/arm/board/fvp/platform.mk
View File

@ -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

2
services/spd/trusty/trusty.mk
View File

@ -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