Merge "revert: replace in-tree Event Log Lib w/ submodule"
diff --git a/plat/arm/fvp/include/platform_def.h b/plat/arm/fvp/include/platform_def.h
index 60c33e9..be41a25 100644
--- a/plat/arm/fvp/include/platform_def.h
+++ b/plat/arm/fvp/include/platform_def.h
@@ -160,7 +160,7 @@
* Base address and limit for NS_BL2U image.
******************************************************************************/
#define NS_BL2U_BASE DRAM_BASE
-#define NS_BL2U_LIMIT (NS_BL2U_BASE + 0x4E000)
+#define NS_BL2U_LIMIT (NS_BL2U_BASE + 0x50000)
/******************************************************************************
* Memory mapped Generic timer interfaces
diff --git a/tftf/tests/runtime_services/host_realm_managment/host_rmi_da_flow.c b/tftf/tests/runtime_services/host_realm_managment/host_rmi_da_flow.c
index ce85080..f110e10 100644
--- a/tftf/tests/runtime_services/host_realm_managment/host_rmi_da_flow.c
+++ b/tftf/tests/runtime_services/host_realm_managment/host_rmi_da_flow.c
@@ -107,8 +107,6 @@
&public_key_algo);
if (rc != 0) {
ERROR("Get public key failed\n");
- /* TF-RMM has support till here. Change error code temporarily */
- result = TEST_RESULT_SUCCESS;
goto err_pdev_reclaim;
}
@@ -143,6 +141,8 @@
rc = host_assign_vdev_to_realm(&realm, h_pdev, h_vdev);
if (rc != 0) {
INFO("VDEV assign to realm failed\n");
+ /* TF-RMM has support till here. Change error code temporarily */
+ result = TEST_RESULT_SUCCESS;
goto err_pdev_reclaim;
}