diff options
| author | Yatharth Kochar <yatharth.kochar@arm.com> | 2016-09-12 16:10:33 +0100 |
|---|---|---|
| committer | Yatharth Kochar <yatharth.kochar@arm.com> | 2016-09-20 16:16:42 +0100 |
| commit | 42019bf4e93a111984af9dc44608d8d5203a3b1d (patch) | |
| tree | 0461e4c07a91a35c0ba7e7e588339dcdea28f3b6 /include | |
| parent | 7260022636e3b0d3ef641cbda135d98f9a7df177 (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 'include')
| -rw-r--r-- | include/plat/common/common_def.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/plat/common/common_def.h b/include/plat/common/common_def.h index d6b77727..7fef3392 100644 --- a/include/plat/common/common_def.h +++ b/include/plat/common/common_def.h @@ -70,6 +70,18 @@ #define MAKE_ULL(x) x #endif +#if LOAD_IMAGE_V2 +#define BL2_IMAGE_DESC { \ + .image_id = BL2_IMAGE_ID, \ + SET_STATIC_PARAM_HEAD(image_info, PARAM_EP, \ + VERSION_2, image_info_t, 0), \ + .image_info.image_base = BL2_BASE, \ + .image_info.image_max_size = BL2_LIMIT - BL2_BASE,\ + SET_STATIC_PARAM_HEAD(ep_info, PARAM_EP, \ + VERSION_2, entry_point_info_t, SECURE | EXECUTABLE),\ + .ep_info.pc = BL2_BASE, \ +} +#else /* LOAD_IMAGE_V2 */ #define BL2_IMAGE_DESC { \ .image_id = BL2_IMAGE_ID, \ SET_STATIC_PARAM_HEAD(image_info, PARAM_EP, \ @@ -79,6 +91,7 @@ VERSION_1, entry_point_info_t, SECURE | EXECUTABLE),\ .ep_info.pc = BL2_BASE, \ } +#endif /* LOAD_IMAGE_V2 */ /* * The following constants identify the extents of the code & read-only data |