diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-24 17:16:35 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-09-28 15:34:17 +0100 |
| commit | 991f1f4d94560adec7f4679339b3e6b4916d6896 (patch) | |
| tree | 08d481d214c8afd46dc90c8b23a424860e7ba4bc /plat/socionext | |
| parent | 2d6f1f01b141775a192e36d120073f67b7b378c2 (diff) | |
uniphier: Migrate to new interfaces
- Remove references to removed build options.
- Migrate to bl31_early_platform_setup2().
Change-Id: I9242c4d02a36e385bf0bf8ee56287106030153d1
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'plat/socionext')
| -rw-r--r-- | plat/socionext/uniphier/platform.mk | 3 | ||||
| -rw-r--r-- | plat/socionext/uniphier/uniphier_bl31_setup.c | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/plat/socionext/uniphier/platform.mk b/plat/socionext/uniphier/platform.mk index 6de51646..e7a1bfe5 100644 --- a/plat/socionext/uniphier/platform.mk +++ b/plat/socionext/uniphier/platform.mk @@ -6,11 +6,8 @@ override BL2_AT_EL3 := 1 override COLD_BOOT_SINGLE_CPU := 1 -override ENABLE_PLAT_COMPAT := 0 -override LOAD_IMAGE_V2 := 1 override PROGRAMMABLE_RESET_ADDRESS := 1 override USE_COHERENT_MEM := 1 -override USE_TBBR_DEFS := 1 override ENABLE_SVE_FOR_NS := 0 # Cortex-A53 revision r0p4-51rel0 diff --git a/plat/socionext/uniphier/uniphier_bl31_setup.c b/plat/socionext/uniphier/uniphier_bl31_setup.c index 9e28eecd..c5acdbd7 100644 --- a/plat/socionext/uniphier/uniphier_bl31_setup.c +++ b/plat/socionext/uniphier/uniphier_bl31_setup.c @@ -28,8 +28,13 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) return type == NON_SECURE ? &bl33_image_ep_info : &bl32_image_ep_info; } -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) { + void *from_bl2; + + from_bl2 = (void *) arg0; + bl_params_node_t *bl_params = ((bl_params_t *)from_bl2)->head; uniphier_console_setup(); |