diff options
| author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-03-12 15:54:28 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-03-12 15:54:28 +0000 |
| commit | d2737fe1c60c9a3a60510855d0f726e70a7ccb5b (patch) | |
| tree | 0dd14d2a2ee294f6d8ba86ccaaeaf90053fd01b9 /bl31/bl31.ld.S | |
| parent | 8fd41bb973c472d188f7030d4a742ac514bff10e (diff) | |
| parent | 6138ffbc12f840c44cb214d9d04270c7badc87f9 (diff) | |
| download | platform_external_arm-trusted-firmware-d2737fe1c60c9a3a60510855d0f726e70a7ccb5b.tar.gz platform_external_arm-trusted-firmware-d2737fe1c60c9a3a60510855d0f726e70a7ccb5b.tar.bz2 platform_external_arm-trusted-firmware-d2737fe1c60c9a3a60510855d0f726e70a7ccb5b.zip | |
Merge changes from topic "mp/enhanced_pal_hw" into integration
* changes:
plat/arm/fvp: populate pwr domain descriptor dynamically
fconf: Extract topology node properties from HW_CONFIG dtb
fconf: necessary modifications to support fconf in BL31 & SP_MIN
fconf: enhancements to firmware configuration framework
Diffstat (limited to 'bl31/bl31.ld.S')
| -rw-r--r-- | bl31/bl31.ld.S | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S index e0138acbb..5f9f9df5b 100644 --- a/bl31/bl31.ld.S +++ b/bl31/bl31.ld.S @@ -55,6 +55,11 @@ SECTIONS KEEP(*(rt_svc_descs)) __RT_SVC_DESCS_END__ = .; + . = ALIGN(8); + __FCONF_POPULATOR_START__ = .; + KEEP(*(.fconf_populator)) + __FCONF_POPULATOR_END__ = .; + #if ENABLE_PMF /* Ensure 8-byte alignment for descriptors and ensure inclusion */ . = ALIGN(8); @@ -102,6 +107,11 @@ SECTIONS KEEP(*(rt_svc_descs)) __RT_SVC_DESCS_END__ = .; + . = ALIGN(8); + __FCONF_POPULATOR_START__ = .; + KEEP(*(.fconf_populator)) + __FCONF_POPULATOR_END__ = .; + #if ENABLE_PMF /* Ensure 8-byte alignment for descriptors and ensure inclusion */ . = ALIGN(8); |