Skip to content

GitLab

Commit be3a51ce authored by Madhukar Pappireddy's avatar Madhukar Pappireddy Committed by TrustedFirmware Code Review
Browse files

Merge "feat(plat/versal): add support for SLS mitigation" into integration

parents d6449d29 302b4dfb
Show whitespace changes
Inline Side-by-side
docs/plat/xilinx-versal.rst
View file @ be3a51ce
...@@ -24,6 +24,11 @@ To build TF-A for JTAG DCC console ...@@ -24,6 +24,11 @@ To build TF-A for JTAG DCC console
make RESET_TO_BL31=1 CROSS_COMPILE=aarch64-none-elf- PLAT=versal bl31 VERSAL_CONSOLE=dcc make RESET_TO_BL31=1 CROSS_COMPILE=aarch64-none-elf- PLAT=versal bl31 VERSAL_CONSOLE=dcc
``` ```
To build TF-A with Straight-Line Speculation(SLS)
```bash
make RESET_TO_BL31=1 CROSS_COMPILE=aarch64-none-elf- PLAT=versal bl31 HARDEN_SLS_ALL=1
```
Xilinx Versal platform specific build options Xilinx Versal platform specific build options
--------------------------------------------- ---------------------------------------------
......
plat/xilinx/versal/platform.mk
View file @ be3a51ce
...@@ -9,6 +9,7 @@ SEPARATE_CODE_AND_RODATA := 1 ...@@ -9,6 +9,7 @@ SEPARATE_CODE_AND_RODATA := 1
override RESET_TO_BL31 := 1 override RESET_TO_BL31 := 1
PL011_GENERIC_UART := 1 PL011_GENERIC_UART := 1
IPI_CRC_CHECK := 0 IPI_CRC_CHECK := 0
HARDEN_SLS_ALL := 0
ifdef VERSAL_ATF_MEM_BASE ifdef VERSAL_ATF_MEM_BASE
$(eval $(call add_define,VERSAL_ATF_MEM_BASE)) $(eval $(call add_define,VERSAL_ATF_MEM_BASE))
...@@ -87,3 +88,7 @@ BL31_SOURCES += drivers/arm/cci/cci.c \ ...@@ -87,3 +88,7 @@ BL31_SOURCES += drivers/arm/cci/cci.c \
plat/xilinx/versal/pm_service/pm_svc_main.c \ plat/xilinx/versal/pm_service/pm_svc_main.c \
plat/xilinx/versal/pm_service/pm_api_sys.c \ plat/xilinx/versal/pm_service/pm_api_sys.c \
plat/xilinx/versal/pm_service/pm_client.c plat/xilinx/versal/pm_service/pm_client.c
ifeq ($(HARDEN_SLS_ALL), 1)
TF_CFLAGS_aarch64 += -mharden-sls=all
endif
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