diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | bl31/aarch64/bl31_entrypoint.S | 4 | ||||
| -rw-r--r-- | make_helpers/defaults.mk | 3 |
3 files changed, 1 insertions, 8 deletions
@@ -1094,7 +1094,6 @@ $(eval $(call assert_booleans,\ PROGRAMMABLE_RESET_ADDRESS \ PSCI_EXTENDED_STATE_ID \ RESET_TO_BL31 \ - RESET_TO_BL31_WITH_PARAMS \ SAVE_KEYS \ SEPARATE_CODE_AND_RODATA \ SEPARATE_BL2_NOLOAD_REGION \ @@ -1236,7 +1235,6 @@ $(eval $(call add_defines,\ PSCI_EXTENDED_STATE_ID \ RAS_EXTENSION \ RESET_TO_BL31 \ - RESET_TO_BL31_WITH_PARAMS \ SEPARATE_CODE_AND_RODATA \ SEPARATE_BL2_NOLOAD_REGION \ SEPARATE_NOBITS_REGION \ diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S index b0c46dc7b..ed058648f 100644 --- a/bl31/aarch64/bl31_entrypoint.S +++ b/bl31/aarch64/bl31_entrypoint.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2022, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2021, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -67,7 +67,6 @@ 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 @@ -78,7 +77,6 @@ func bl31_entrypoint mov x21, 0 mov x22, 0 mov x23, 0 -#endif /* RESET_TO_BL31_WITH_PARAMS */ #endif /* RESET_TO_BL31 */ /* -------------------------------------------------------------------- diff --git a/make_helpers/defaults.mk b/make_helpers/defaults.mk index a66123a7d..771cef13c 100644 --- a/make_helpers/defaults.mk +++ b/make_helpers/defaults.mk @@ -261,9 +261,6 @@ RAS_EXTENSION := 0 # By default, BL1 acts as the reset handler, not BL31 RESET_TO_BL31 := 0 -# By default, clear the input registers when RESET_TO_BL31 is enabled -RESET_TO_BL31_WITH_PARAMS := 0 - # For Chain of Trust SAVE_KEYS := 0 |