Commit 819dcd7c authored by Antonio Nino Diaz's avatar Antonio Nino Diaz
Browse files

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: default avatarAntonio Nino Diaz <antonio.ninodiaz@arm.com>
parent 873e394b
...@@ -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
......
...@@ -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