diff options
author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-24 17:15:46 +0100 |
---|---|---|
committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-28 15:34:17 +0100 |
commit | 35795b4e878467300b3bdccc37d7486a9c8942c6 (patch) | |
tree | c4bd0cd1336ab9a2ca93611fd9f4778bd22724e0 /include | |
parent | b840662cb0b3cb8d8c29b49d4f77e1762152a2c4 (diff) | |
download | platform_external_arm-trusted-firmware-35795b4e878467300b3bdccc37d7486a9c8942c6.tar.gz platform_external_arm-trusted-firmware-35795b4e878467300b3bdccc37d7486a9c8942c6.tar.bz2 platform_external_arm-trusted-firmware-35795b4e878467300b3bdccc37d7486a9c8942c6.zip |
marvell: Migrate to new interfaces
- Migrate to bl2_early_platform_setup2().
- Remove references to removed build options.
- Use private definition of bl31_params_t.
This is an incomplete migration, the platform doesn't currently compile.
Change-Id: I1ae477b1f2489f49b651528050fdf06e4a55e425
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/plat/marvell/a8k/common/board_marvell_def.h | 4 | ||||
-rw-r--r-- | include/plat/marvell/a8k/common/plat_marvell.h | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/include/plat/marvell/a8k/common/board_marvell_def.h b/include/plat/marvell/a8k/common/board_marvell_def.h index b1054db22..e67543ed5 100644 --- a/include/plat/marvell/a8k/common/board_marvell_def.h +++ b/include/plat/marvell/a8k/common/board_marvell_def.h @@ -14,9 +14,7 @@ */ /* Size of cacheable stacks */ -#if DEBUG_XLAT_TABLE -# define PLATFORM_STACK_SIZE 0x800 -#elif IMAGE_BL1 +#if IMAGE_BL1 #if TRUSTED_BOARD_BOOT # define PLATFORM_STACK_SIZE 0x1000 #else diff --git a/include/plat/marvell/a8k/common/plat_marvell.h b/include/plat/marvell/a8k/common/plat_marvell.h index 9ca68d3bc..a62a7cb08 100644 --- a/include/plat/marvell/a8k/common/plat_marvell.h +++ b/include/plat/marvell/a8k/common/plat_marvell.h @@ -24,6 +24,15 @@ extern const mmap_region_t plat_marvell_mmap[]; <= MAX_MMAP_REGIONS, \ assert_max_mmap_regions) +struct marvell_bl31_params { + param_header_t h; + image_info_t *bl31_image_info; + entry_point_info_t *bl32_ep_info; + image_info_t *bl32_image_info; + entry_point_info_t *bl33_ep_info; + image_info_t *bl33_image_info; +}; + /* * Utility functions common to Marvell standard platforms */ @@ -67,7 +76,7 @@ uint32_t marvell_get_spsr_for_bl32_entry(void); uint32_t marvell_get_spsr_for_bl33_entry(void); /* BL31 utility functions */ -void marvell_bl31_early_platform_setup(struct bl31_params *from_bl2, +void marvell_bl31_early_platform_setup(void *from_bl2, uintptr_t soc_fw_config, uintptr_t hw_config, void *plat_params_from_bl2); |