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>

diff --git a/plat/socionext/uniphier/platform.mk b/plat/socionext/uniphier/platform.mk
index 6de5164673e4a0254982e6e33d70e1f58b86f572..e7a1bfe5c936e90d9151fdc1a717fa65c949533e 100644 (file)
--- 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 9e28eecd7db01a2ec3d0f01bc83a19f68b83d486..c5acdbd70fd97788a1396c35468afa72e28e52cd 100644 (file)
--- 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();