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>

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 a29e14198f753544487b0c756eed11c25906d3d1..c670d423cdcf5912bd7a065d754d7a5ccbd5dbac 100644 (file)
--- a/plat/imx/imx7/warp7/warp7_bl2_mem_params_desc.c
+++ b/plat/imx/imx7/warp7/warp7_bl2_mem_params_desc.c
@@ -27,16 +27,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,
 

diff --git a/plat/imx/imx7/warp7/warp7_io_storage.c b/plat/imx/imx7/warp7/warp7_io_storage.c
index b9cace09063ca8886e1d497bf7a88f86226efb42..6f0319d1dcc36f6e1848046f21e8eb6102a8f50d 100644 (file)
--- 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,