From 101d01e2a2e34a568fb25c2ef2390fd71183413e Mon Sep 17 00:00:00 2001 From: Soby Mathew Date: Wed, 10 Jan 2018 12:51:34 +0000 Subject: BL1: Deprecate the `bl1_init_bl2_mem_layout()` API The `bl1_init_bl2_mem_layout()` API is now deprecated. The default weak implementation of `bl1_plat_handle_post_image_load()` calculates the BL2 memory layout and populates the same in x1(r1). This ensures compatibility for the deprecated API. Change-Id: Id44bdc1f572dc42ee6ceef4036b3a46803689315 Signed-off-by: Soby Mathew --- include/bl1/bl1.h | 6 +++++- include/plat/common/platform.h | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/bl1/bl1.h b/include/bl1/bl1.h index 15445235..b0421007 100644 --- a/include/bl1/bl1.h +++ b/include/bl1/bl1.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -71,5 +71,9 @@ CASSERT(FWU_NUM_SMC_CALLS == \ (FWU_SMC_FID_END - FWU_SMC_FID_START + 1),\ assert_FWU_NUM_SMC_CALLS_mismatch); +/* Utility functions */ +void bl1_calc_bl2_mem_layout(const meminfo_t *bl1_mem_layout, + meminfo_t *bl2_mem_layout); + #endif /* __ASSEMBLY__ */ #endif /* __BL1_FWU_H__ */ diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h index 088c3c82..411202da 100644 --- a/include/plat/common/platform.h +++ b/include/plat/common/platform.h @@ -134,9 +134,10 @@ int bl1_plat_mem_check(uintptr_t mem_base, unsigned int mem_size, /******************************************************************************* * Optional BL1 functions (may be overridden) ******************************************************************************/ +#if !ERROR_DEPRECATED void bl1_init_bl2_mem_layout(const struct meminfo *bl1_mem_layout, struct meminfo *bl2_mem_layout); - +#endif /* * The following functions are used for image loading process in BL1. */ -- cgit v1.2.3