Skip to content

GitLab

Commit 9be5ca7a authored by Sandrine Bailleux's avatar Sandrine Bailleux Committed by TrustedFirmware Code Review
Browse files

Merge "arm: Fix current RECLAIM_INIT_CODE behavior" into integration

parents ae630cdb a71c59d5
Show whitespace changes
Inline Side-by-side
include/plat/arm/common/arm_reclaim_init.ld.S
View file @ 9be5ca7a
/* /*
* 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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -27,10 +27,9 @@ SECTIONS ...@@ -27,10 +27,9 @@ SECTIONS
"BL31 init has exceeded progbits limit.") "BL31 init has exceeded progbits limit.")
#endif #endif
#if RECLAIM_INIT_CODE
ASSERT(__INIT_CODE_END__ <= __STACKS_END__, ASSERT(__INIT_CODE_END__ <= __STACKS_END__,
"Init code ends past the end of the stacks") "Init code ends past the end of the stacks")
#endif
} }
#endif /* ARM_RECLAIM_INIT_LD_S */ #endif /* ARM_RECLAIM_INIT_LD_S */
plat/arm/board/fvp/include/plat.ld.S
View file @ 9be5ca7a
/* /*
* 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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -7,6 +7,9 @@ ...@@ -7,6 +7,9 @@
#define PLAT_LD_S #define PLAT_LD_S
#include <plat/arm/common/arm_tzc_dram.ld.S> #include <plat/arm/common/arm_tzc_dram.ld.S>
#if RECLAIM_INIT_CODE
#include <plat/arm/common/arm_reclaim_init.ld.S> #include <plat/arm/common/arm_reclaim_init.ld.S>
#endif /* RECLAIM_INIT_CODE */
#endif /* PLAT_LD_S */ #endif /* PLAT_LD_S */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment