diff options
Diffstat (limited to 'plat/hisilicon/hikey960/hikey960_bl31_setup.c')
-rw-r--r-- | plat/hisilicon/hikey960/hikey960_bl31_setup.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/plat/hisilicon/hikey960/hikey960_bl31_setup.c b/plat/hisilicon/hikey960/hikey960_bl31_setup.c index f0d15a35..f8921f27 100644 --- a/plat/hisilicon/hikey960/hikey960_bl31_setup.c +++ b/plat/hisilicon/hikey960/hikey960_bl31_setup.c @@ -78,13 +78,8 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) return NULL; } -#if LOAD_IMAGE_V2 void bl31_early_platform_setup(void *from_bl2, void *plat_params_from_bl2) -#else -void bl31_early_platform_setup(bl31_params_t *from_bl2, - void *plat_params_from_bl2) -#endif { unsigned int id, uart_base; @@ -102,7 +97,6 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2, cci_init(CCI400_REG_BASE, cci_map, ARRAY_SIZE(cci_map)); cci_enable_snoop_dvm_reqs(MPIDR_AFFLVL1_VAL(read_mpidr_el1())); -#if LOAD_IMAGE_V2 /* * Check params passed from BL2 should not be NULL, */ @@ -129,23 +123,6 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2, if (bl33_ep_info.pc == 0) panic(); - -#else /* LOAD_IMAGE_V2 */ - - /* - * Check params passed from BL2 should not be NULL, - */ - assert(from_bl2 != NULL); - assert(from_bl2->h.type == PARAM_BL31); - assert(from_bl2->h.version >= VERSION_1); - - /* - * Copy BL3-2 and BL3-3 entry point information. - * They are stored in Secure RAM, in BL2's address space. - */ - bl32_ep_info = *from_bl2->bl32_ep_info; - bl33_ep_info = *from_bl2->bl33_ep_info; -#endif /* LOAD_IMAGE_V2 */ } void bl31_plat_arch_setup(void) |