From a64010e4c675f4476fe0c995762199fc1f218c30 Mon Sep 17 00:00:00 2001 From: Boyan Karatotev Date: Wed, 15 Mar 2023 13:47:20 +0000 Subject: [PATCH] chore(bl1): remove redundant bl1_arch_next_el_setup bl1_arch_next_el_setup has no references anywhere in TF-A. Remove it as it is redundant Signed-off-by: Boyan Karatotev Change-Id: Ice2997f33c318390883347acdd03dc6755f87ea5 --- bl1/aarch64/bl1_arch_setup.c | 16 ---------------- bl1/bl1_private.h | 1 - plat/arm/board/fvp_r/fvp_r_bl1_arch_setup.c | 16 ---------------- 3 files changed, 33 deletions(-) diff --git a/bl1/aarch64/bl1_arch_setup.c b/bl1/aarch64/bl1_arch_setup.c index 0a1cb304a..f3de53699 100644 --- a/bl1/aarch64/bl1_arch_setup.c +++ b/bl1/aarch64/bl1_arch_setup.c @@ -17,19 +17,3 @@ void bl1_arch_setup(void) /* Set the next EL to be AArch64 */ write_scr_el3(read_scr_el3() | SCR_RW_BIT); } - -/******************************************************************************* - * Set the Secure EL1 required architectural state - ******************************************************************************/ -void bl1_arch_next_el_setup(void) -{ - u_register_t next_sctlr; - - /* Use the same endianness than the current BL */ - next_sctlr = (read_sctlr_el3() & SCTLR_EE_BIT); - - /* Set SCTLR Secure EL1 */ - next_sctlr |= SCTLR_EL1_RES1; - - write_sctlr_el1(next_sctlr); -} diff --git a/bl1/bl1_private.h b/bl1/bl1_private.h index e119ba727..61fb5beed 100644 --- a/bl1/bl1_private.h +++ b/bl1/bl1_private.h @@ -17,7 +17,6 @@ extern entry_point_info_t *bl2_ep_info; * Function prototypes *****************************************/ void bl1_arch_setup(void); -void bl1_arch_next_el_setup(void); void bl1_prepare_next_image(unsigned int image_id); void bl1_run_bl2_in_root(void); diff --git a/plat/arm/board/fvp_r/fvp_r_bl1_arch_setup.c b/plat/arm/board/fvp_r/fvp_r_bl1_arch_setup.c index ae6af6c08..820470bc7 100644 --- a/plat/arm/board/fvp_r/fvp_r_bl1_arch_setup.c +++ b/plat/arm/board/fvp_r/fvp_r_bl1_arch_setup.c @@ -17,19 +17,3 @@ void bl1_arch_setup(void) { /* v8-R64 does not include SCRs. */ } - -/******************************************************************************* - * Set the Secure EL1 required architectural state - ******************************************************************************/ -void bl1_arch_next_el_setup(void) -{ - u_register_t next_sctlr; - - /* Use the same endianness than the current BL */ - next_sctlr = (read_sctlr_el2() & SCTLR_EE_BIT); - - /* Set SCTLR Secure EL1 */ - next_sctlr |= SCTLR_EL1_RES1; - - write_sctlr_el1(next_sctlr); -}