diff options
| author | Madhukar Pappireddy <madhukar.pappireddy@arm.com> | 2022-04-29 23:12:21 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2022-04-29 23:12:21 +0200 |
| commit | 894c635b8316f579dc3cceab310ed878092f6bb1 (patch) | |
| tree | 37c6519c6c3f928fa1ac5b04f71cd10d60d3950d /bl31 | |
| parent | a0cad7ce4f3bea1d3e9aacab5066ef8e3c915c65 (diff) | |
| parent | ac4ac38c5443afdef38e38e9247c96359de3a2ea (diff) | |
| download | arm-trusted-firmware-894c635b8316f579dc3cceab310ed878092f6bb1.tar.gz | |
Merge changes I47014d72,Ibf00c386 into integration
* changes:
docs(bl31): aarch64: RESET_TO_BL31_WITH_PARAMS
feat(bl31): aarch64: RESET_TO_BL31_WITH_PARAMS
Diffstat (limited to 'bl31')
| -rw-r--r-- | bl31/aarch64/bl31_entrypoint.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S index ed058648f..b0c46dc7b 100644 --- a/bl31/aarch64/bl31_entrypoint.S +++ b/bl31/aarch64/bl31_entrypoint.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2021, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2022, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -67,6 +67,7 @@ func bl31_entrypoint _exception_vectors=runtime_exceptions \ _pie_fixup_size=BL31_LIMIT - BL31_BASE +#if !RESET_TO_BL31_WITH_PARAMS /* --------------------------------------------------------------------- * For RESET_TO_BL31 systems, BL31 is the first bootloader to run so * there's no argument to relay from a previous bootloader. Zero the @@ -77,6 +78,7 @@ func bl31_entrypoint mov x21, 0 mov x22, 0 mov x23, 0 +#endif /* RESET_TO_BL31_WITH_PARAMS */ #endif /* RESET_TO_BL31 */ /* -------------------------------------------------------------------- |