Revert commit "Workaround: Setup register context for BL3-3"

This reverts commit 033c52bc054b730bdeacba1cc90c38efc8c3a131
because the workaround it introduced is no longer needed since
BL3-1 interface rework.

This does not revert the change on BL33 base address on Juno, though.

Change-Id: Idc747718a0af94c54931d4a9932f145350b0a75f

bl31/bl31_main.c

@@ -182,14 +182,6 @@ void bl31_prepare_next_image_entry()
 				(MODE_RW_64 << MODE_RW_SHIFT))
 		scr |= SCR_RW_BIT;
 
-	/*
-	 * Setup general purpose registers context for next image.
-	 */
-	cpu_context_t *context = cm_get_context(read_mpidr(),
-					next_image_info->security_state);
-	memcpy(&context->gpregs_ctx, &next_image_info->args,
-					sizeof(next_image_info->args));
-
 	/*
 	 * Tell the context mgmt. library to ensure that SP_EL3 points to
 	 * the right context to exit from EL3 correctly.

plat/juno/bl31_plat_setup.c

@@ -114,8 +114,6 @@ void bl31_early_platform_setup(bl31_params_t *from_bl2,
 
 	bl2_to_bl31_params = from_bl2;
 
-	/* UEFI expects x0 to be primary CPU MPID */
-	bl2_to_bl31_args.bl33_image_info.args.arg0 = PRIMARY_CPU;
 }
 
 /*******************************************************************************