aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan O'Donoghue <bryan.odonoghue@linaro.org>2019-05-28 18:27:28 +0100
committerBryan O'Donoghue <bryan.odonoghue@linaro.org>2019-05-28 18:27:28 +0100
commit012627778099cba44eea2e2f6ef787ffec650d57 (patch)
tree65593fb1ab5db01e792e944a3d5a93d1102f82a3
parentb4b62b411ac267699f71b7241fed35a734a277b7 (diff)
pico: Fixup header paths
Between the older versions of ATF and the never version we are moving to here, the header paths have changed. Minor update to fix. Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
-rw-r--r--plat/imx/imx7/picopi/picopi_bl2_el3_setup.c14
-rw-r--r--plat/imx/imx7/picopi/picopi_bl2_mem_params_desc.c2
-rw-r--r--plat/imx/imx7/picopi/picopi_image_load.c2
-rw-r--r--plat/imx/imx7/picopi/picopi_io_storage.c12
4 files changed, 15 insertions, 15 deletions
diff --git a/plat/imx/imx7/picopi/picopi_bl2_el3_setup.c b/plat/imx/imx7/picopi/picopi_bl2_el3_setup.c
index 54fd58b6..76c32244 100644
--- a/plat/imx/imx7/picopi/picopi_bl2_el3_setup.c
+++ b/plat/imx/imx7/picopi/picopi_bl2_el3_setup.c
@@ -7,16 +7,16 @@
#include <arch_helpers.h>
#include <assert.h>
#include <common/bl_common.h>
-#include <console.h>
+#include <drivers/console.h>
#include <common/debug.h>
#include <common/desc_image_load.h>
-#include <mmc.h>
-#include <mmio.h>
-#include <optee_utils.h>
+#include <drivers/mmc.h>
+#include <lib/mmio.h>
+#include <lib/optee_utils.h>
#include <platform_def.h>
-#include <utils.h>
-#include <xlat_mmu_helpers.h>
-#include <xlat_tables_defs.h>
+#include <lib/utils.h>
+#include <lib/xlat_tables/xlat_mmu_helpers.h>
+#include <lib/xlat_tables/xlat_tables_defs.h>
#include <imx_aips.h>
#include <imx_caam.h>
#include <imx_clock.h>
diff --git a/plat/imx/imx7/picopi/picopi_bl2_mem_params_desc.c b/plat/imx/imx7/picopi/picopi_bl2_mem_params_desc.c
index d070d518..397b30a8 100644
--- a/plat/imx/imx7/picopi/picopi_bl2_mem_params_desc.c
+++ b/plat/imx/imx7/picopi/picopi_bl2_mem_params_desc.c
@@ -6,7 +6,7 @@
#include <common/bl_common.h>
#include <common/desc_image_load.h>
-#include <platform.h>
+#include <plat/common/platform.h>
#include <platform_def.h>
static bl_mem_params_node_t bl2_mem_params_descs[] = {
diff --git a/plat/imx/imx7/picopi/picopi_image_load.c b/plat/imx/imx7/picopi/picopi_image_load.c
index 47459b8e..c3e47b9d 100644
--- a/plat/imx/imx7/picopi/picopi_image_load.c
+++ b/plat/imx/imx7/picopi/picopi_image_load.c
@@ -6,7 +6,7 @@
#include <common/bl_common.h>
#include <common/desc_image_load.h>
-#include <platform.h>
+#include <plat/common/platform.h>
void plat_flush_next_bl_params(void)
{
diff --git a/plat/imx/imx7/picopi/picopi_io_storage.c b/plat/imx/imx7/picopi/picopi_io_storage.c
index 1df44d18..60ff3fd1 100644
--- a/plat/imx/imx7/picopi/picopi_io_storage.c
+++ b/plat/imx/imx7/picopi/picopi_io_storage.c
@@ -5,12 +5,12 @@
*/
#include <assert.h>
#include <common/debug.h>
-#include <mmc.h>
-#include <firmware_image_package.h>
-#include <io_block.h>
-#include <io_driver.h>
-#include <io_fip.h>
-#include <io_memmap.h>
+#include <drivers/mmc.h>
+#include <tools_share/firmware_image_package.h>
+#include <drivers/io/io_block.h>
+#include <drivers/io/io_driver.h>
+#include <drivers/io/io_fip.h>
+#include <drivers/io/io_memmap.h>
#include <platform_def.h>
static const io_dev_connector_t *fip_dev_con;