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

Merge "plat/arm: Re-enable PIE when RESET_TO_BL31=1" into integration

This commit is contained in:
Paul Beesley 2019-11-12 17:00:13 +00:00 committed by TrustedFirmware Code Review
parent 87d35d933d 133a5c6802
commit 63b9627190
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/plat/arm/common/arm_def.h
View File

@ -403,21 +403,16 @@
#define BL31_LIMIT (ARM_AP_TZC_DRAM1_BASE + \ #define BL31_LIMIT (ARM_AP_TZC_DRAM1_BASE + \
PLAT_ARM_MAX_BL31_SIZE) PLAT_ARM_MAX_BL31_SIZE)
#elif (RESET_TO_BL31) #elif (RESET_TO_BL31)
/* Ensure Position Independent support (PIE) is enabled for this config.*/
# if ENABLE_PIE # if !ENABLE_PIE
# error "BL31 must be a PIE if RESET_TO_BL31=1."
#endif
/* /*
* Since this is PIE, we can define BL31_BASE to 0x0 since this macro is solely * Since this is PIE, we can define BL31_BASE to 0x0 since this macro is solely
* used for building BL31 and not used for loading BL31. * used for building BL31 and not used for loading BL31.
*/ */
# define BL31_BASE 0x0 # define BL31_BASE 0x0
# define BL31_LIMIT PLAT_ARM_MAX_BL31_SIZE # define BL31_LIMIT PLAT_ARM_MAX_BL31_SIZE
# else
/* Put BL31_BASE in the middle of the Trusted SRAM.*/
# define BL31_BASE (ARM_TRUSTED_SRAM_BASE + \
(PLAT_ARM_TRUSTED_SRAM_SIZE >> 1))
# define BL31_LIMIT (ARM_BL_RAM_BASE + ARM_BL_RAM_SIZE)
# endif /* ENABLE_PIE */
#else #else
/* Put BL31 below BL2 in the Trusted SRAM.*/ /* Put BL31 below BL2 in the Trusted SRAM.*/
#define BL31_BASE ((ARM_BL_RAM_BASE + ARM_BL_RAM_SIZE)\ #define BL31_BASE ((ARM_BL_RAM_BASE + ARM_BL_RAM_SIZE)\

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

@ -244,15 +244,10 @@ ENABLE_AMU := 1
# Enable dynamic mitigation support by default # Enable dynamic mitigation support by default
DYNAMIC_WORKAROUND_CVE_2018_3639 := 1 DYNAMIC_WORKAROUND_CVE_2018_3639 := 1
# Enable reclaiming of BL31 initialisation code for secondary cores
# stacks for FVP.
ifneq (${RESET_TO_BL31},1) ifneq (${RESET_TO_BL31},1)
# Enable reclaiming of BL31 initialisation code for secondary cores stacks for
# FVP. We cannot enable PIE for this case because the overlayed init section
# creates some dynamic relocations which cannot be handled by the fixup
# logic currently.
RECLAIM_INIT_CODE := 1 RECLAIM_INIT_CODE := 1
else
# Enable PIE support when RESET_TO_BL31=1
ENABLE_PIE := 1
endif endif
ifeq (${ENABLE_AMU},1) ifeq (${ENABLE_AMU},1)

5
plat/arm/common/arm_common.mk
View File

@ -130,6 +130,11 @@ ARM_CRYPTOCELL_INTEG := 0
$(eval $(call assert_boolean,ARM_CRYPTOCELL_INTEG)) $(eval $(call assert_boolean,ARM_CRYPTOCELL_INTEG))
$(eval $(call add_define,ARM_CRYPTOCELL_INTEG)) $(eval $(call add_define,ARM_CRYPTOCELL_INTEG))
# Enable PIE support for RESET_TO_BL31 case
ifeq (${RESET_TO_BL31},1)
ENABLE_PIE := 1
endif
# CryptoCell integration relies on coherent buffers for passing data from # CryptoCell integration relies on coherent buffers for passing data from
# the AP CPU to the CryptoCell # the AP CPU to the CryptoCell
ifeq (${ARM_CRYPTOCELL_INTEG},1) ifeq (${ARM_CRYPTOCELL_INTEG},1)