diff options
| -rw-r--r-- | plat/rpi3/include/platform_def.h | 5 | ||||
| -rw-r--r-- | plat/rpi3/platform.mk | 2 | ||||
| -rw-r--r-- | plat/rpi3/rpi3_bl2_setup.c | 6 | ||||
| -rw-r--r-- | plat/rpi3/rpi3_bl31_setup.c | 18 |
4 files changed, 17 insertions, 14 deletions
diff --git a/plat/rpi3/include/platform_def.h b/plat/rpi3/include/platform_def.h index 195037603..76a5ff440 100644 --- a/plat/rpi3/include/platform_def.h +++ b/plat/rpi3/include/platform_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -215,7 +215,8 @@ /* * Other memory-related defines. */ -#define ADDR_SPACE_SIZE (ULL(1) << 32) +#define PLAT_PHY_ADDR_SPACE_SIZE (ULL(1) << 32) +#define PLAT_VIRT_ADDR_SPACE_SIZE (ULL(1) << 32) #define MAX_MMAP_REGIONS 8 #define MAX_XLAT_TABLES 4 diff --git a/plat/rpi3/platform.mk b/plat/rpi3/platform.mk index 4276c84f8..8eb467e6a 100644 --- a/plat/rpi3/platform.mk +++ b/plat/rpi3/platform.mk @@ -35,7 +35,7 @@ BL2_SOURCES += common/desc_image_load.c \ plat/rpi3/rpi3_io_storage.c BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \ - plat/common/aarch64/plat_psci_common.c \ + plat/common/plat_psci_common.c \ plat/rpi3/aarch64/plat_helpers.S \ plat/rpi3/rpi3_bl31_setup.c \ plat/rpi3/rpi3_pm.c \ diff --git a/plat/rpi3/rpi3_bl2_setup.c b/plat/rpi3/rpi3_bl2_setup.c index 13e8c0155..c78024eaa 100644 --- a/plat/rpi3/rpi3_bl2_setup.c +++ b/plat/rpi3/rpi3_bl2_setup.c @@ -24,8 +24,12 @@ static meminfo_t bl2_tzram_layout __aligned(CACHE_WRITEBACK_GRANULE); * in x0. This memory layout is sitting at the base of the free trusted SRAM. * Copy it to a safe location before its reclaimed by later BL2 functionality. ******************************************************************************/ -void bl2_early_platform_setup(meminfo_t *mem_layout) + +void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1, + u_register_t arg2, u_register_t arg3) { + meminfo_t *mem_layout = (meminfo_t *) arg1; + /* Initialize the console to provide early debug support */ rpi3_console_init(); diff --git a/plat/rpi3/rpi3_bl31_setup.c b/plat/rpi3/rpi3_bl31_setup.c index 5bbb13c86..306f26b3f 100644 --- a/plat/rpi3/rpi3_bl31_setup.c +++ b/plat/rpi3/rpi3_bl31_setup.c @@ -53,23 +53,21 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) * tables. BL2 has flushed this information to memory, so we are guaranteed * to pick up good data. ******************************************************************************/ -void bl31_early_platform_setup(void *from_bl2, - void *plat_params_from_bl2) +void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1, + u_register_t arg2, u_register_t arg3) + { /* Initialize the console to provide early debug support */ rpi3_console_init(); /* - * In debug builds, we pass a special value in 'plat_params_from_bl2' - * to verify platform parameters from BL2 to BL31. - * In release builds, it's not used. + * In debug builds, a special value is passed in 'arg1' to verify + * platform parameters from BL2 to BL31. Not used in release builds. */ - assert(((uintptr_t)plat_params_from_bl2) == RPI3_BL31_PLAT_PARAM_VAL); + assert(arg1 == RPI3_BL31_PLAT_PARAM_VAL); - /* - * Check params passed from BL2 should not be NULL, - */ - bl_params_t *params_from_bl2 = (bl_params_t *)from_bl2; + /* Check that params passed from BL2 are not NULL. */ + bl_params_t *params_from_bl2 = (bl_params_t *) arg0; assert(params_from_bl2 != NULL); assert(params_from_bl2->h.type == PARAM_BL_PARAMS); |