diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2020-02-04 16:37:09 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-02-04 16:37:09 +0000 |
| commit | 9eac8e958e363b9c2772f1c1ff93ba3530b1fbad (patch) | |
| tree | 5000fb558a1dd59eed9a0bcdc155a68be1208841 /include | |
| parent | 44e3424e34593cb9c363edca33ecd8a648a0d75e (diff) | |
| parent | 0c1f197aa12ba19046671c4741be03aa54a90866 (diff) | |
| download | platform_external_arm-trusted-firmware-9eac8e958e363b9c2772f1c1ff93ba3530b1fbad.tar.gz platform_external_arm-trusted-firmware-9eac8e958e363b9c2772f1c1ff93ba3530b1fbad.tar.bz2 platform_external_arm-trusted-firmware-9eac8e958e363b9c2772f1c1ff93ba3530b1fbad.zip | |
Merge changes from topic "mp/separate_nobits" into integration
* changes:
plat/arm: Add support for SEPARATE_NOBITS_REGION
Changes necessary to support SEPARATE_NOBITS_REGION feature
Diffstat (limited to 'include')
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index b419c853e..5bd53f3b5 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -395,13 +395,21 @@ /******************************************************************************* * BL31 specific defines. ******************************************************************************/ -#if ARM_BL31_IN_DRAM +#if ARM_BL31_IN_DRAM || SEPARATE_NOBITS_REGION /* * Put BL31 at the bottom of TZC secured DRAM */ #define BL31_BASE ARM_AP_TZC_DRAM1_BASE #define BL31_LIMIT (ARM_AP_TZC_DRAM1_BASE + \ PLAT_ARM_MAX_BL31_SIZE) +/* + * For SEPARATE_NOBITS_REGION, BL31 PROGBITS are loaded in TZC secured DRAM. + * And BL31 NOBITS are loaded in Trusted SRAM such that BL2 is overwritten. + */ +#if SEPARATE_NOBITS_REGION +#define BL31_NOBITS_BASE BL2_BASE +#define BL31_NOBITS_LIMIT BL2_LIMIT +#endif /* SEPARATE_NOBITS_REGION */ #elif (RESET_TO_BL31) /* Ensure Position Independent support (PIE) is enabled for this config.*/ # if !ENABLE_PIE |