Commit c2f31c99 authored by Bryan O'Donoghue's avatar Bryan O'Donoghue
Browse files

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: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
parent f0bfe15b
...@@ -27,16 +27,6 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = { ...@@ -27,16 +27,6 @@ static bl_mem_params_node_t bl2_mem_params_descs[] = {
.next_handoff_image_id = BL33_IMAGE_ID, .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, .image_id = BL32_EXTRA1_IMAGE_ID,
......
...@@ -60,10 +60,6 @@ static const io_uuid_spec_t bl32_uuid_spec = { ...@@ -60,10 +60,6 @@ static const io_uuid_spec_t bl32_uuid_spec = {
.uuid = UUID_SECURE_PAYLOAD_BL32, .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 = { static const io_uuid_spec_t bl32_extra1_uuid_spec = {
.uuid = UUID_SECURE_PAYLOAD_BL32_EXTRA1, .uuid = UUID_SECURE_PAYLOAD_BL32_EXTRA1,
}; };
...@@ -112,11 +108,6 @@ static const struct plat_io_policy policies[] = { ...@@ -112,11 +108,6 @@ static const struct plat_io_policy policies[] = {
(uintptr_t)&bl32_extra2_uuid_spec, (uintptr_t)&bl32_extra2_uuid_spec,
open_fip open_fip
}, },
[HW_CONFIG_ID] = {
&fip_dev_handle,
(uintptr_t)&hw_config_uuid_spec,
open_fip
},
[BL33_IMAGE_ID] = { [BL33_IMAGE_ID] = {
&fip_dev_handle, &fip_dev_handle,
(uintptr_t)&bl33_uuid_spec, (uintptr_t)&bl33_uuid_spec,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment