diff options
author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-02-27 14:32:35 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-27 14:32:35 +0000 |
commit | 57bc6424cd7021e64d2af876b7d79b685893a208 (patch) | |
tree | 7ac40b1632b32078b667add460c4f1a3a0b5ed5b /bl2/aarch32/bl2_entrypoint.S | |
parent | fc159c62ed6779bbf64882535e245629dd059e98 (diff) | |
parent | 67b6ff9f8ccd84cea1627d738f3e2d4eb0a789e1 (diff) | |
download | trusted-firmware-a-57bc6424cd7021e64d2af876b7d79b685893a208.tar.gz |
Merge pull request #1829 from antonio-nino-diaz-arm/an/pauth
Add Pointer Authentication (ARMv8.3-PAuth) support to the TF
Diffstat (limited to 'bl2/aarch32/bl2_entrypoint.S')
-rw-r--r-- | bl2/aarch32/bl2_entrypoint.S | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bl2/aarch32/bl2_entrypoint.S b/bl2/aarch32/bl2_entrypoint.S index e7b98af32f..23d1513565 100644 --- a/bl2/aarch32/bl2_entrypoint.S +++ b/bl2/aarch32/bl2_entrypoint.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -108,16 +108,15 @@ func bl2_entrypoint #endif /* --------------------------------------------- - * Perform early platform setup & platform - * specific early arch. setup e.g. mmu setup + * Perform BL2 setup * --------------------------------------------- */ mov r0, r9 mov r1, r10 mov r2, r11 mov r3, r12 - bl bl2_early_platform_setup2 - bl bl2_plat_arch_setup + + bl bl2_setup /* --------------------------------------------- * Jump to main function. |