diff options
| author | Bryan O'Donoghue <bryan.odonoghue@linaro.org> | 2018-11-29 14:46:05 +0000 |
|---|---|---|
| committer | Bryan O'Donoghue <bryan.odonoghue@linaro.org> | 2019-01-18 14:24:09 +0000 |
| commit | c2f31c99fef7fe613f6b2f1db012c95c32f1ca08 (patch) | |
| tree | fc2f1bb4b923ba5b167b4042e4817a4828bf7d30 | |
| parent | f0bfe15b81e50c6561a3a9a8e269db0267778910 (diff) | |
warp7: io_storage: Remove DTB from FIP
Recently upstreamed changes to OP-TEE mean that it is possible for OP-TEE
to provide a DTB overlay directly to subsequent boot stages thus negating
the requirement to bundle a DTB in the FIP.
This patch switches off the dependency on the DTB in the FIP descriptor
instead we will provide the necessary data as an overlay from OP-TEE.
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
| -rw-r--r-- | plat/imx/imx7/warp7/warp7_bl2_mem_params_desc.c | 10 | ||||
| -rw-r--r-- | plat/imx/imx7/warp7/warp7_io_storage.c | 9 |
2 files changed, 0 insertions, 19 deletions
diff --git a/plat/imx/imx7/warp7/warp7_bl2_mem_params_desc.c b/plat/imx/imx7/warp7/warp7_bl2_mem_params_desc.c index a29e1419..c670d423 100644 --- a/plat/imx/imx7/warp7/warp7_bl2_mem_params_desc.c +++ b/plat/imx/imx7/warp7/warp7_bl2_mem_params_desc.c @@ -28,16 +28,6 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = { .next_handoff_image_id = BL33_IMAGE_ID, }, { - .image_id = HW_CONFIG_ID, - SET_STATIC_PARAM_HEAD(ep_info, PARAM_IMAGE_BINARY, - VERSION_2, entry_point_info_t, SECURE | NON_EXECUTABLE), - SET_STATIC_PARAM_HEAD(image_info, PARAM_IMAGE_BINARY, - VERSION_2, image_info_t, 0), - .image_info.image_base = WARP7_DTB_BASE, - .image_info.image_max_size = WARP7_DTB_SIZE, - .next_handoff_image_id = INVALID_IMAGE_ID, - }, - { .image_id = BL32_EXTRA1_IMAGE_ID, SET_STATIC_PARAM_HEAD(ep_info, PARAM_EP, VERSION_2, diff --git a/plat/imx/imx7/warp7/warp7_io_storage.c b/plat/imx/imx7/warp7/warp7_io_storage.c index b9cace09..6f0319d1 100644 --- a/plat/imx/imx7/warp7/warp7_io_storage.c +++ b/plat/imx/imx7/warp7/warp7_io_storage.c @@ -60,10 +60,6 @@ static const io_uuid_spec_t bl32_uuid_spec = { .uuid = UUID_SECURE_PAYLOAD_BL32, }; -static const io_uuid_spec_t hw_config_uuid_spec = { - .uuid = UUID_HW_CONFIG, -}; - static const io_uuid_spec_t bl32_extra1_uuid_spec = { .uuid = UUID_SECURE_PAYLOAD_BL32_EXTRA1, }; @@ -112,11 +108,6 @@ static const struct plat_io_policy policies[] = { (uintptr_t)&bl32_extra2_uuid_spec, open_fip }, - [HW_CONFIG_ID] = { - &fip_dev_handle, - (uintptr_t)&hw_config_uuid_spec, - open_fip - }, [BL33_IMAGE_ID] = { &fip_dev_handle, (uintptr_t)&bl33_uuid_spec, |