Skip to content

GitLab

Unverified Commit fa233ac9 authored by Antonio Niño Díaz's avatar Antonio Niño Díaz Committed by GitHub
Browse files

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

fvp: trusty: Move dynamic xlat enable to platform
parents ba2d7f92 819dcd7c
master v2.5 v2.5-rc1 v2.5-rc0 v2.4 v2.4-rc2 v2.4-rc1 v2.4-rc0 v2.3 v2.3-rc2 v2.3-rc1 v2.3-rc0 v2.2 v2.2-rc2 v2.2-rc1 v2.2-rc0 v2.1 v2.1-rc1 v2.1-rc0 arm_cca_v0.2 arm_cca_v0.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 3 deletions
+4 -3
plat/arm/board/fvp/platform.mk
View file @ fa233ac9
...@@ -236,7 +236,7 @@ ifeq (${ARCH},aarch32) ...@@ -236,7 +236,7 @@ ifeq (${ARCH},aarch32)
ifeq (${RESET_TO_SP_MIN},1) ifeq (${RESET_TO_SP_MIN},1)
BL32_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL32_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif endif
else else # if AArch64
ifeq (${RESET_TO_BL31},1) ifeq (${RESET_TO_BL31},1)
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif endif
...@@ -245,6 +245,9 @@ else ...@@ -245,6 +245,9 @@ else
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1 BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif endif
endif endif
ifeq (${SPD},trusty)
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif
endif endif
# Add support for platform supplied linker script for BL31 build # Add support for platform supplied linker script for BL31 build
......
services/spd/trusty/trusty.mk
View file @ fa233ac9
...@@ -13,8 +13,6 @@ ifeq (${TRUSTY_SPD_WITH_GENERIC_SERVICES},1) ...@@ -13,8 +13,6 @@ ifeq (${TRUSTY_SPD_WITH_GENERIC_SERVICES},1)
SPD_SOURCES += services/spd/trusty/generic-arm64-smcall.c SPD_SOURCES += services/spd/trusty/generic-arm64-smcall.c
endif endif
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
NEED_BL32 := yes NEED_BL32 := yes
CTX_INCLUDE_FPREGS := 1 CTX_INCLUDE_FPREGS := 1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment