summaryrefslogtreecommitdiff
path: root/bl2/bl2.mk
diff options
context:
space:
mode:
authorYatharth Kochar <yatharth.kochar@arm.com>2016-09-12 16:10:33 +0100
committerYatharth Kochar <yatharth.kochar@arm.com>2016-09-20 16:16:42 +0100
commit42019bf4e93a111984af9dc44608d8d5203a3b1d (patch)
tree0461e4c07a91a35c0ba7e7e588339dcdea28f3b6 /bl2/bl2.mk
parent7260022636e3b0d3ef641cbda135d98f9a7df177 (diff)
Changes for new version of image loading in BL1/BL2
This patch adds changes in BL1 & BL2 to use new version of image loading to load the BL images. Following are the changes in BL1: -Use new version of load_auth_image() to load BL2 -Modified `bl1_init_bl2_mem_layout()` to remove using `reserve_mem()` and to calculate `bl2_mem_layout`. `bl2_mem_layout` calculation now assumes that BL1 RW data is at the top of the bl1_mem_layout, which is more restrictive than the previous BL1 behaviour. Following are the changes in BL2: -The `bl2_main.c` is refactored and all the functions for loading BLxx images are now moved to `bl2_image_load.c` `bl2_main.c` now calls a top level `bl2_load_images()` to load all the images that are applicable in BL2. -Added new file `bl2_image_load_v2.c` that uses new version of image loading to load the BL images in BL2. All the above changes are conditionally compiled using the `LOAD_IMAGE_V2` flag. Change-Id: Ic6dcde5a484495bdc05526d9121c59fa50c1bf23
Diffstat (limited to 'bl2/bl2.mk')
-rw-r--r--bl2/bl2.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/bl2/bl2.mk b/bl2/bl2.mk
index d7907389..6cb478d1 100644
--- a/bl2/bl2.mk
+++ b/bl2/bl2.mk
@@ -34,4 +34,10 @@ BL2_SOURCES += bl2/bl2_main.c \
common/aarch64/early_exceptions.S \
lib/locks/exclusive/aarch64/spinlock.S
+ifeq (${LOAD_IMAGE_V2},1)
+BL2_SOURCES += bl2/bl2_image_load_v2.c
+else
+BL2_SOURCES += bl2/bl2_image_load.c
+endif
+
BL2_LINKERFILE := bl2/bl2.ld.S