aboutsummaryrefslogtreecommitdiffstats
path: root/plat
diff options
context:
space:
mode:
authorDimitris Papastamos <dimitris.papastamos@arm.com>2018-06-08 13:17:26 +0100
committerGitHub <noreply@github.com>2018-06-08 13:17:26 +0100
commit4a581b061c63cbfd68809e4a87b531a0ff75a085 (patch)
tree22ff1eff92f62b213f39fa2e81d93685588019e8 /plat
parent31ece1e02529b5658de0bcdefc8d4a44a17ff8e2 (diff)
downloadplatform_external_arm-trusted-firmware-4a581b061c63cbfd68809e4a87b531a0ff75a085.tar.gz
platform_external_arm-trusted-firmware-4a581b061c63cbfd68809e4a87b531a0ff75a085.tar.bz2
platform_external_arm-trusted-firmware-4a581b061c63cbfd68809e4a87b531a0ff75a085.zip
Revert "Code change to fix small bugs"
Diffstat (limited to 'plat')
-rw-r--r--plat/arm/common/arm_bl2_setup.c7
1 files changed, 6 insertions, 1 deletions
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