diff options
author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2020-02-11 16:15:45 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-02-11 16:15:45 +0000 |
commit | 21c4f56fa7335fbfd3aeb1175b38b84ef9c798ec (patch) | |
tree | aa6c50e7b657592f39dc2c4286095575eda0a5c6 /bl2 | |
parent | 63aa4094fb08d262546afa51d33611a8be0bc4d2 (diff) | |
parent | 97399821256653115c9d6b5d3233934aa7689c0c (diff) | |
download | trusted-firmware-a-21c4f56fa7335fbfd3aeb1175b38b84ef9c798ec.tar.gz |
Merge changes from topic "lm/fconf" into integration
* changes:
arm-io: Panic in case of io setup failure
MISRA fix: Use boolean essential type
fconf: Add documentation
fconf: Move platform io policies into fconf
fconf: Add mbedtls shared heap as property
fconf: Add TBBR disable_authentication property
fconf: Add dynamic config DTBs info as property
fconf: Populate properties from dtb during bl2 setup
fconf: Load config dtb from bl1
fconf: initial commit
Diffstat (limited to 'bl2')
-rw-r--r-- | bl2/bl2.ld.S | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/bl2/bl2.ld.S b/bl2/bl2.ld.S index 6230562edb..c1338e22d3 100644 --- a/bl2/bl2.ld.S +++ b/bl2/bl2.ld.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -46,6 +46,11 @@ SECTIONS __RODATA_START__ = .; *(SORT_BY_ALIGNMENT(.rodata*)) + . = ALIGN(8); + __FCONF_POPULATOR_START__ = .; + KEEP(*(.fconf_populator)) + __FCONF_POPULATOR_END__ = .; + /* Ensure 8-byte alignment for descriptors and ensure inclusion */ . = ALIGN(8); __PARSER_LIB_DESCS_START__ = .; @@ -62,6 +67,11 @@ SECTIONS *(SORT_BY_ALIGNMENT(.text*)) *(SORT_BY_ALIGNMENT(.rodata*)) + . = ALIGN(8); + __FCONF_POPULATOR_START__ = .; + KEEP(*(.fconf_populator)) + __FCONF_POPULATOR_END__ = .; + /* Ensure 8-byte alignment for descriptors and ensure inclusion */ . = ALIGN(8); __PARSER_LIB_DESCS_START__ = .; |