aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2019-12-10 11:53:50 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2019-12-10 11:53:50 +0000
commit9be5ca7aa6d384596d7fda01b4319ee82a6748de (patch)
treeed04156f0c49b05e365e94e17958d8cf94baf296 /include
parentae630cdbb3a93b7ac4d760747f217a8c58339fcc (diff)
parenta71c59d5cbd112dbaa1299d4b93dcd99bace75e7 (diff)
downloadplatform_external_arm-trusted-firmware-9be5ca7aa6d384596d7fda01b4319ee82a6748de.tar.gz
platform_external_arm-trusted-firmware-9be5ca7aa6d384596d7fda01b4319ee82a6748de.tar.bz2
platform_external_arm-trusted-firmware-9be5ca7aa6d384596d7fda01b4319ee82a6748de.zip
Merge "arm: Fix current RECLAIM_INIT_CODE behavior" into integration
Diffstat (limited to 'include')
-rw-r--r--include/plat/arm/common/arm_reclaim_init.ld.S5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/plat/arm/common/arm_reclaim_init.ld.S b/include/plat/arm/common/arm_reclaim_init.ld.S
index 8f22170fe..b5bf47365 100644
--- a/include/plat/arm/common/arm_reclaim_init.ld.S
+++ b/include/plat/arm/common/arm_reclaim_init.ld.S
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -27,10 +27,9 @@ SECTIONS
"BL31 init has exceeded progbits limit.")
#endif
-#if RECLAIM_INIT_CODE
ASSERT(__INIT_CODE_END__ <= __STACKS_END__,
"Init code ends past the end of the stacks")
-#endif
+
}
#endif /* ARM_RECLAIM_INIT_LD_S */