diff options
| author | Bryan O'Donoghue <bryan.odonoghue@linaro.org> | 2019-05-09 14:36:02 +0100 |
|---|---|---|
| committer | Bryan O'Donoghue <bryan.odonoghue@linaro.org> | 2019-05-09 14:36:02 +0100 |
| commit | 0239ce57edd332d40f741107621642f86a1c1cb3 (patch) | |
| tree | 93ccf9e93c8a618fbf5f7fae50fc682363c7e273 | |
| parent | d40bc61c4a9ebff664408bca9b02656093fc4121 (diff) | |
plat: imx8: Switch on FIP image extractionimx_4.14.78_1.0.0_ga-mbl-bod
This patch switches on extraction of FIP image elements to the addresses we
have defined in the FIP array.
Right now the SPL FIT will already have loaded those images such as u-boot
and OP-TEE to the same memory address but, after this patch ATF will do
that on its own and the SPL/FIT extraction can be gotten rid of.
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
| -rw-r--r-- | plat/imx/imx8mm/imx8mm_io_storage.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/plat/imx/imx8mm/imx8mm_io_storage.c b/plat/imx/imx8mm/imx8mm_io_storage.c index 97c9c044..6e1c4831 100644 --- a/plat/imx/imx8mm/imx8mm_io_storage.c +++ b/plat/imx/imx8mm/imx8mm_io_storage.c @@ -24,7 +24,7 @@ static const io_block_spec_t fip_block_spec = { .length = FIP_SIZE }; static int open_memmap(const uintptr_t spec); -#if 0 + static int open_fip(const uintptr_t spec); @@ -44,7 +44,7 @@ static const io_uuid_spec_t bl33_uuid_spec = { .uuid = UUID_NON_TRUSTED_FIRMWARE_BL33, }; -#if TRUSTED_BOARD_BOOT +#if 0 && TRUSTED_BOARD_BOOT static const io_uuid_spec_t tb_fw_cert_uuid_spec = { .uuid = UUID_TRUSTED_BOOT_FW_CERT, }; @@ -69,7 +69,6 @@ static const io_uuid_spec_t nt_fw_cert_uuid_spec = { .uuid = UUID_NON_TRUSTED_FW_CONTENT_CERT, }; #endif /* TRUSTED_BOARD_BOOT */ -#endif struct plat_io_policy { uintptr_t *dev_handle; @@ -83,7 +82,6 @@ static const struct plat_io_policy policies[] = { (uintptr_t)&fip_block_spec, open_memmap }, -#if 0 [BL32_IMAGE_ID] = { &fip_dev_handle, (uintptr_t)&bl32_uuid_spec, @@ -104,7 +102,7 @@ static const struct plat_io_policy policies[] = { (uintptr_t)&bl33_uuid_spec, open_fip }, -#if TRUSTED_BOARD_BOOT +#if 0 && TRUSTED_BOARD_BOOT [TRUSTED_BOOT_FW_CERT_ID] = { &fip_dev_handle, (uintptr_t)&tb_fw_cert_uuid_spec, @@ -136,9 +134,8 @@ static const struct plat_io_policy policies[] = { open_fip }, #endif /* TRUSTED_BOARD_BOOT */ -#endif }; -#if 0 + static int open_fip(const uintptr_t spec) { int result; @@ -155,7 +152,7 @@ static int open_fip(const uintptr_t spec) } return result; } -#endif + static int open_memmap(const uintptr_t spec) { int result; |