diff --git a/common/bl_common.c b/common/bl_common.c index fe4de0ae7..d01ef9244 100644 --- a/common/bl_common.c +++ b/common/bl_common.c @@ -211,18 +211,7 @@ int load_auth_image(unsigned int image_id, image_info_t *image_data) { int err; -/* - * All firmware banks should be part of the same non-volatile storage as per - * PSA FWU specification, hence don't check for any alternate boot source - * when PSA FWU is enabled. - */ -#if PSA_FWU_SUPPORT err = load_auth_image_internal(image_id, image_data); -#else - do { - err = load_auth_image_internal(image_id, image_data); - } while ((err != 0) && (plat_try_next_boot_source() != 0)); -#endif /* PSA_FWU_SUPPORT */ if (err == 0) { /* diff --git a/docs/porting-guide.rst b/docs/porting-guide.rst index a7600ec51..f85294b5d 100644 --- a/docs/porting-guide.rst +++ b/docs/porting-guide.rst @@ -1607,9 +1607,6 @@ This function executes with the MMU and data caches enabled. It is responsible for performing any remaining platform-specific setup that can occur after the MMU and data cache have been enabled. -if support for multiple boot sources is required, it initializes the boot -sequence used by plat_try_next_boot_source(). - In Arm standard platforms, this function initializes the storage abstraction layer used to load the next bootloader image. @@ -1892,25 +1889,7 @@ Function : bl2_plat_preload_setup [optional] This optional function performs any BL2 platform initialization required before image loading, that is not done later in -bl2_platform_setup(). Specifically, if support for multiple -boot sources is required, it initializes the boot sequence used by -plat_try_next_boot_source(). - -Function : plat_try_next_boot_source() [optional] -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -:: - - Argument : void - Return : int - -This optional function passes to the next boot source in the redundancy -sequence. - -This function moves the current boot redundancy source to the next -element in the boot sequence. If there are no more boot sources then it -must return 0, otherwise it must return 1. The default implementation -of this always returns 0. +bl2_platform_setup(). Boot Loader Stage 2 (BL2) at EL3 -------------------------------- diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h index ce5e8e0d9..09fce8213 100644 --- a/include/plat/common/platform.h +++ b/include/plat/common/platform.h @@ -154,7 +154,6 @@ void plat_panic_handler(void) __dead2; void plat_system_reset(void) __dead2; const char *plat_log_get_prefix(unsigned int log_level); void bl2_plat_preload_setup(void); -int plat_try_next_boot_source(void); #if MEASURED_BOOT int plat_mboot_measure_image(unsigned int image_id, image_info_t *image_data); diff --git a/plat/common/plat_bl_common.c b/plat/common/plat_bl_common.c index 89b77ba6c..a603f2b10 100644 --- a/plat/common/plat_bl_common.c +++ b/plat/common/plat_bl_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -24,7 +24,6 @@ #pragma weak bl2_plat_preload_setup #pragma weak bl2_plat_handle_pre_image_load #pragma weak bl2_plat_handle_post_image_load -#pragma weak plat_try_next_boot_source #pragma weak plat_get_enc_key_info #pragma weak plat_is_smccc_feature_available #pragma weak plat_get_soc_version @@ -69,11 +68,6 @@ int bl2_plat_handle_post_image_load(unsigned int image_id) return 0; } -int plat_try_next_boot_source(void) -{ - return 0; -} - /* * Weak implementation to provide dummy decryption key only for test purposes, * platforms must override this API for any real world firmware encryption