diff options
Diffstat (limited to 'bl2/bl2_main.c')
| -rw-r--r-- | bl2/bl2_main.c | 49 |
1 files changed, 20 insertions, 29 deletions
diff --git a/bl2/bl2_main.c b/bl2/bl2_main.c index d2de1350d..90fe39bc2 100644 --- a/bl2/bl2_main.c +++ b/bl2/bl2_main.c @@ -15,9 +15,6 @@ #include <drivers/auth/auth_mod.h> #include <drivers/console.h> #include <drivers/fwu/fwu.h> -#if MEASURED_BOOT -#include <drivers/measured_boot/measured_boot.h> -#endif #include <lib/extensions/pauth.h> #include <plat/common/platform.h> @@ -29,18 +26,18 @@ #define NEXT_IMAGE "BL32" #endif -#if !BL2_AT_EL3 +#if BL2_AT_EL3 /******************************************************************************* - * Setup function for BL2. + * Setup function for BL2 when BL2_AT_EL3=1 ******************************************************************************/ -void bl2_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2, - u_register_t arg3) +void bl2_el3_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2, + u_register_t arg3) { /* Perform early platform-specific setup */ - bl2_early_platform_setup2(arg0, arg1, arg2, arg3); + bl2_el3_early_platform_setup(arg0, arg1, arg2, arg3); /* Perform late platform-specific setup */ - bl2_plat_arch_setup(); + bl2_el3_plat_arch_setup(); #if CTX_INCLUDE_PAUTH_REGS /* @@ -50,19 +47,18 @@ void bl2_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2, assert(is_armv8_3_pauth_present()); #endif /* CTX_INCLUDE_PAUTH_REGS */ } - -#else /* if BL2_AT_EL3 */ +#else /* BL2_AT_EL3 */ /******************************************************************************* - * Setup function for BL2 when BL2_AT_EL3=1. + * Setup function for BL2 when BL2_AT_EL3=0 ******************************************************************************/ -void bl2_el3_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2, - u_register_t arg3) +void bl2_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2, + u_register_t arg3) { /* Perform early platform-specific setup */ - bl2_el3_early_platform_setup(arg0, arg1, arg2, arg3); + bl2_early_platform_setup2(arg0, arg1, arg2, arg3); /* Perform late platform-specific setup */ - bl2_el3_plat_arch_setup(); + bl2_plat_arch_setup(); #if CTX_INCLUDE_PAUTH_REGS /* @@ -96,26 +92,21 @@ void bl2_main(void) #if TRUSTED_BOARD_BOOT /* Initialize authentication module */ auth_mod_init(); - -#if MEASURED_BOOT - /* Initialize measured boot module */ - measured_boot_init(); - -#endif /* MEASURED_BOOT */ #endif /* TRUSTED_BOARD_BOOT */ + /* Initialize the Measured Boot backend */ + bl2_plat_mboot_init(); + /* Initialize boot source */ bl2_plat_preload_setup(); /* Load the subsequent bootloader images. */ next_bl_ep_info = bl2_load_images(); -#if MEASURED_BOOT - /* Finalize measured boot */ - measured_boot_finish(); -#endif /* MEASURED_BOOT */ + /* Teardown the Measured Boot backend */ + bl2_plat_mboot_finish(); -#if !BL2_AT_EL3 +#if !BL2_AT_EL3 && !ENABLE_RME #ifndef __aarch64__ /* * For AArch32 state BL1 and BL2 share the MMU setup. @@ -140,7 +131,7 @@ void bl2_main(void) * be passed to next BL image as an argument. */ smc(BL1_SMC_RUN_IMAGE, (unsigned long)next_bl_ep_info, 0, 0, 0, 0, 0, 0); -#else /* if BL2_AT_EL3 */ +#else /* if BL2_AT_EL3 || ENABLE_RME */ NOTICE("BL2: Booting " NEXT_IMAGE "\n"); print_entry_point_info(next_bl_ep_info); console_flush(); @@ -153,5 +144,5 @@ void bl2_main(void) #endif /* ENABLE_PAUTH */ bl2_run_next_image(next_bl_ep_info); -#endif /* BL2_AT_EL3 */ +#endif /* BL2_AT_EL3 && ENABLE_RME */ } |