diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-06-08 13:17:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-08 13:17:26 +0100 |
| commit | 4a581b061c63cbfd68809e4a87b531a0ff75a085 (patch) | |
| tree | 22ff1eff92f62b213f39fa2e81d93685588019e8 | |
| parent | 31ece1e02529b5658de0bcdefc8d4a44a17ff8e2 (diff) | |
| download | arm-trusted-firmware-revert-1389-db/bugfix.tar.gz | |
Revert "Code change to fix small bugs"revert-1389-db/bugfix
| -rw-r--r-- | common/runtime_svc.c | 1 | ||||
| -rw-r--r-- | plat/arm/common/arm_bl2_setup.c | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/common/runtime_svc.c b/common/runtime_svc.c index e0d56095d..f997c74a0 100644 --- a/common/runtime_svc.c +++ b/common/runtime_svc.c @@ -38,6 +38,7 @@ uintptr_t handle_runtime_svc(uint32_t smc_fid, u_register_t x1, x2, x3, x4; int index; unsigned int idx; + const rt_svc_desc_t *rt_svc_descs; assert(handle); idx = get_unique_oen_from_smc_fid(smc_fid); diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c index fd7a9e9a2..4ef3a9b0f 100644 --- a/plat/arm/common/arm_bl2_setup.c +++ b/plat/arm/common/arm_bl2_setup.c @@ -36,7 +36,12 @@ CASSERT(BL2_BASE >= ARM_TB_FW_CONFIG_LIMIT, assert_bl2_base_overflows); #pragma weak bl2_plat_arch_setup #pragma weak bl2_plat_sec_mem_layout -#if !LOAD_IMAGE_V2 +#if LOAD_IMAGE_V2 + +#pragma weak bl2_plat_handle_post_image_load + +#else /* LOAD_IMAGE_V2 */ + /******************************************************************************* * This structure represents the superset of information that is passed to * BL31, e.g. while passing control to it from BL2, bl31_params |