diff options
| author | Dan Handley <dan.handley@arm.com> | 2014-04-15 11:38:38 +0100 |
|---|---|---|
| committer | Andrew Thoelke <andrew.thoelke@arm.com> | 2014-05-22 23:15:36 +0100 |
| commit | 1151c82101eb3cb2472d3b513f0c828ad098b13c (patch) | |
| tree | d98c5e19feaecdb4c970ce160caa1a9bed35f9ea /drivers | |
| parent | dbad1bacba0a7adfd3c7c559f0fd0805087aeddd (diff) | |
Allow BL3-2 platform definitions to be optional
The generic image loading and IO FIP code no longer forces the
platform to create BL3-2 (Secure-EL1 Payload) specific
definitions. The BL3-2 loading code in bl2/bl2main.c is wrapped
by a #ifdef BL32_BASE blocks, allowing the BL3-2 definitions to
be optional. Similarly for the name_uuid array defintion in
drivers/io/io_fip.c.
Also update the porting guide to reflect this change.
The BL3-2 platform definitions remain non-configurably present
in the FVP port.
Fixes ARM-software/tf-issues#68
Change-Id: Iea28b4e94d87a31f5522f271e290919a8a955460
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/io/io_fip.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/io/io_fip.c b/drivers/io/io_fip.c index 4848a70..8ed7f47 100644 --- a/drivers/io/io_fip.c +++ b/drivers/io/io_fip.c @@ -65,7 +65,10 @@ typedef struct { static const plat_fip_name_uuid_t name_uuid[] = { {BL2_IMAGE_NAME, UUID_TRUSTED_BOOT_FIRMWARE_BL2}, {BL31_IMAGE_NAME, UUID_EL3_RUNTIME_FIRMWARE_BL31}, +#ifdef BL32_IMAGE_NAME + /* BL3-2 is optional in the platform */ {BL32_IMAGE_NAME, UUID_SECURE_PAYLOAD_BL32}, +#endif /* BL32_IMAGE_NAME */ {BL33_IMAGE_NAME, UUID_NON_TRUSTED_FIRMWARE_BL33}, }; |