aboutsummaryrefslogtreecommitdiff
path: root/plat/arm/common/arm_bl2_setup.c
diff options
context:
space:
mode:
authorDimitris Papastamos <dimitris.papastamos@arm.com>2018-06-08 11:45:06 +0100
committerGitHub <noreply@github.com>2018-06-08 11:45:06 +0100
commit83685de911a7a5372a01d656d4cf434c27313426 (patch)
tree2ab7f0ce609efe5d7b288c110bf4874d4d72658a /plat/arm/common/arm_bl2_setup.c
parentb1f701be13821a360b1ab40482aec7ec00f3b647 (diff)
parentc43f0464dacb421cf1c2a9d9c6375f6d97bf71c5 (diff)
downloadtrusted-firmware-a-83685de911a7a5372a01d656d4cf434c27313426.tar.gz
Merge pull request #1389 from danielboulby-arm/db/bugfix
Code change to fix small bugs
Diffstat (limited to 'plat/arm/common/arm_bl2_setup.c')
-rw-r--r--plat/arm/common/arm_bl2_setup.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c
index 4ef3a9b0ff..fd7a9e9a29 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