summaryrefslogtreecommitdiff
path: root/bl32/sp_min
diff options
context:
space:
mode:
authorMark Dykes <mardyk01@review.trustedfirmware.org>2020-03-12 15:54:28 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-03-12 15:54:28 +0000
commitd2737fe1c60c9a3a60510855d0f726e70a7ccb5b (patch)
tree0dd14d2a2ee294f6d8ba86ccaaeaf90053fd01b9 /bl32/sp_min
parent8fd41bb973c472d188f7030d4a742ac514bff10e (diff)
parent6138ffbc12f840c44cb214d9d04270c7badc87f9 (diff)
downloadarm-trusted-firmware-d2737fe1c60c9a3a60510855d0f726e70a7ccb5b.tar.gz
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 'bl32/sp_min')
-rw-r--r--bl32/sp_min/sp_min.ld.S10
1 files changed, 10 insertions, 0 deletions
diff --git a/bl32/sp_min/sp_min.ld.S b/bl32/sp_min/sp_min.ld.S
index 3b1ca1b58..a90a805a0 100644
--- a/bl32/sp_min/sp_min.ld.S
+++ b/bl32/sp_min/sp_min.ld.S
@@ -56,6 +56,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 4-byte alignment for descriptors and ensure inclusion */
. = ALIGN(4);
@@ -93,6 +98,11 @@ SECTIONS
KEEP(*(rt_svc_descs))
__RT_SVC_DESCS_END__ = .;
+ . = ALIGN(8);
+ __FCONF_POPULATOR_START__ = .;
+ KEEP(*(.fconf_populator))
+ __FCONF_POPULATOR_END__ = .;
+
/*
* Ensure 4-byte alignment for cpu_ops so that its fields are also
* aligned. Also ensure cpu_ops inclusion.