aboutsummaryrefslogtreecommitdiffstats
path: root/plat
diff options
context:
space:
mode:
authorAmbroise Vincent <ambroise.vincent@arm.com>2019-07-16 17:19:38 +0100
committerZelalem <zelalem.aweke@arm.com>2019-12-09 11:09:09 -0600
commita71c59d5cbd112dbaa1299d4b93dcd99bace75e7 (patch)
tree098afcedce113388897e05242fa78f2faad66572 /plat
parent87b582ef5b31c5893a470b61c217931fc7602da3 (diff)
downloadplatform_external_arm-trusted-firmware-a71c59d5cbd112dbaa1299d4b93dcd99bace75e7.tar.gz
platform_external_arm-trusted-firmware-a71c59d5cbd112dbaa1299d4b93dcd99bace75e7.tar.bz2
platform_external_arm-trusted-firmware-a71c59d5cbd112dbaa1299d4b93dcd99bace75e7.zip
arm: Fix current RECLAIM_INIT_CODE behavior
Previously the .init section was created even when the reclaim flag was manually set to 0. Change-Id: Ia9e7c7997261f54a4eca725d7ea605192f60bcf8 Signed-off-by: Ambroise Vincent <ambroise.vincent@arm.com> Zelalem Aweke <zelalem.aweke@arm.com>
Diffstat (limited to 'plat')
-rw-r--r--plat/arm/board/fvp/include/plat.ld.S5
1 files changed, 4 insertions, 1 deletions
diff --git a/plat/arm/board/fvp/include/plat.ld.S b/plat/arm/board/fvp/include/plat.ld.S
index f024f551a..7c8bf0655 100644
--- a/plat/arm/board/fvp/include/plat.ld.S
+++ b/plat/arm/board/fvp/include/plat.ld.S
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -7,6 +7,9 @@
#define PLAT_LD_S
#include <plat/arm/common/arm_tzc_dram.ld.S>
+
+#if RECLAIM_INIT_CODE
#include <plat/arm/common/arm_reclaim_init.ld.S>
+#endif /* RECLAIM_INIT_CODE */
#endif /* PLAT_LD_S */