diff options
| author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-06-08 11:45:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-08 11:45:06 +0100 |
| commit | 83685de911a7a5372a01d656d4cf434c27313426 (patch) | |
| tree | 2ab7f0ce609efe5d7b288c110bf4874d4d72658a | |
| parent | b1f701be13821a360b1ab40482aec7ec00f3b647 (diff) | |
| parent | c43f0464dacb421cf1c2a9d9c6375f6d97bf71c5 (diff) | |
| download | arm-trusted-firmware-83685de911a7a5372a01d656d4cf434c27313426.tar.gz | |
Merge pull request #1389 from danielboulby-arm/db/bugfix
Code change to fix small bugs
| -rw-r--r-- | common/runtime_svc.c | 1 | ||||
| -rw-r--r-- | plat/arm/common/arm_bl2_setup.c | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/common/runtime_svc.c b/common/runtime_svc.c index f997c74a0..e0d56095d 100644 --- a/common/runtime_svc.c +++ b/common/runtime_svc.c @@ -38,7 +38,6 @@ 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 4ef3a9b0f..fd7a9e9a2 100644 --- a/plat/arm/common/arm_bl2_setup.c +++ b/plat/arm/common/arm_bl2_setup.c @@ -36,12 +36,7 @@ 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 - -#pragma weak bl2_plat_handle_post_image_load - -#else /* LOAD_IMAGE_V2 */ - +#if !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 |