diff options
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/arm/board/fvp/include/platform_def.h | 4 | ||||
| -rw-r--r-- | plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c | 2 | ||||
| -rw-r--r-- | plat/arm/common/sp_min/arm_sp_min_setup.c | 15 | ||||
| -rw-r--r-- | plat/common/aarch32/plat_common.c | 24 | ||||
| -rw-r--r-- | plat/common/aarch32/plat_sp_min_common.c | 36 |
5 files changed, 52 insertions, 29 deletions
diff --git a/plat/arm/board/fvp/include/platform_def.h b/plat/arm/board/fvp/include/platform_def.h index 4ac08504c..2d0149034 100644 --- a/plat/arm/board/fvp/include/platform_def.h +++ b/plat/arm/board/fvp/include/platform_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -43,7 +43,7 @@ /* No SCP in FVP */ #define PLAT_ARM_SCP_TZC_DRAM1_SIZE ULL(0x0) -#define PLAT_ARM_DRAM2_SIZE ULL(0x780000000) +#define PLAT_ARM_DRAM2_SIZE ULL(0x80000000) /* * Load address of BL33 for this platform port diff --git a/plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c b/plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c index 6cced4ddb..7c89c27e3 100644 --- a/plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c +++ b/plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c @@ -7,7 +7,7 @@ #include <plat_arm.h> #include "../fvp_private.h" -void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1, +void plat_arm_sp_min_early_platform_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2, u_register_t arg3) { arm_sp_min_early_platform_setup((void *)arg0, arg1, arg2, (void *)arg3); diff --git a/plat/arm/common/sp_min/arm_sp_min_setup.c b/plat/arm/common/sp_min/arm_sp_min_setup.c index 1776d46a7..7b5477ec3 100644 --- a/plat/arm/common/sp_min/arm_sp_min_setup.c +++ b/plat/arm/common/sp_min/arm_sp_min_setup.c @@ -18,9 +18,9 @@ static entry_point_info_t bl33_image_ep_info; /* Weak definitions may be overridden in specific ARM standard platform */ -#pragma weak sp_min_early_platform_setup2 #pragma weak sp_min_platform_setup #pragma weak sp_min_plat_arch_setup +#pragma weak plat_arm_sp_min_early_platform_setup /******************************************************************************* @@ -46,7 +46,7 @@ entry_point_info_t *sp_min_plat_get_bl33_ep_info(void) } /******************************************************************************* - * Perform early platform setup. + * Utility function to perform early platform setup. ******************************************************************************/ void arm_sp_min_early_platform_setup(void *from_bl2, uintptr_t tos_fw_config, uintptr_t hw_config, void *plat_params_from_bl2) @@ -105,7 +105,10 @@ void arm_sp_min_early_platform_setup(void *from_bl2, uintptr_t tos_fw_config, } -void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1, +/******************************************************************************* + * Default implementation for sp_min_platform_setup2() for ARM platforms + ******************************************************************************/ +void plat_arm_sp_min_early_platform_setup(u_register_t arg0, u_register_t arg1, u_register_t arg2, u_register_t arg3) { arm_sp_min_early_platform_setup((void *)arg0, arg1, arg2, (void *)arg3); @@ -127,6 +130,12 @@ void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1, plat_arm_interconnect_enter_coherency(); } +void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1, + u_register_t arg2, u_register_t arg3) +{ + plat_arm_sp_min_early_platform_setup(arg0, arg1, arg2, arg3); +} + /******************************************************************************* * Perform any SP_MIN platform runtime setup prior to SP_MIN exit. * Common to ARM standard platforms. diff --git a/plat/common/aarch32/plat_common.c b/plat/common/aarch32/plat_common.c index c02386983..4f2714902 100644 --- a/plat/common/aarch32/plat_common.c +++ b/plat/common/aarch32/plat_common.c @@ -4,9 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <console.h> #include <platform.h> -#include <platform_sp_min.h> #include <xlat_mmu_helpers.h> /* @@ -15,29 +13,9 @@ * platforms but may also be overridden by a platform if required. */ #pragma weak bl32_plat_enable_mmu -#pragma weak sp_min_plat_runtime_setup + void bl32_plat_enable_mmu(uint32_t flags) { enable_mmu_secure(flags); } - -void sp_min_plat_runtime_setup(void) -{ - /* - * Finish the use of console driver in SP_MIN so that any runtime logs - * from SP_MIN will be suppressed. - */ - console_uninit(); -} - -#if !ERROR_DEPRECATED - -#pragma weak sp_min_early_platform_setup2 - -void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1, - u_register_t arg2, u_register_t arg3) -{ - sp_min_early_platform_setup((void *) arg0, (void *)arg1); -} -#endif diff --git a/plat/common/aarch32/plat_sp_min_common.c b/plat/common/aarch32/plat_sp_min_common.c new file mode 100644 index 000000000..67ae817e6 --- /dev/null +++ b/plat/common/aarch32/plat_sp_min_common.c @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <console.h> +#include <platform.h> +#include <platform_sp_min.h> + +/* + * The following platform setup functions are weakly defined. They + * provide typical implementations that may be re-used by multiple + * platforms but may also be overridden by a platform if required. + */ +#pragma weak sp_min_plat_runtime_setup + +void sp_min_plat_runtime_setup(void) +{ + /* + * Finish the use of console driver in SP_MIN so that any runtime logs + * from SP_MIN will be suppressed. + */ + console_uninit(); +} + +#if !ERROR_DEPRECATED + +#pragma weak sp_min_early_platform_setup2 + +void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1, + u_register_t arg2, u_register_t arg3) +{ + sp_min_early_platform_setup((void *)arg0, (void *)arg1); +} +#endif |