diff options
author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-12-14 00:18:21 +0000 |
---|---|---|
committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2019-01-04 10:43:17 +0000 |
commit | 09d40e0e08283a249e7dce0e106c07c5141f9b7e (patch) | |
tree | 46e7af7b5be2738948b359b2a07078e4cf1bbec1 /plat/xilinx | |
parent | f5478dedf9e096d9539362b38ceb096b940ba3e2 (diff) |
Sanitise includes across codebase
Enforce full include path for includes. Deprecate old paths.
The following folders inside include/lib have been left unchanged:
- include/lib/cpus/${ARCH}
- include/lib/el3_runtime/${ARCH}
The reason for this change is that having a global namespace for
includes isn't a good idea. It defeats one of the advantages of having
folders and it introduces problems that are sometimes subtle (because
you may not know the header you are actually including if there are two
of them).
For example, this patch had to be created because two headers were
called the same way: e0ea0928d5b7 ("Fix gpio includes of mt8173 platform
to avoid collision."). More recently, this patch has had similar
problems: 46f9b2c3a282 ("drivers: add tzc380 support").
This problem was introduced in commit 4ecca33988b9 ("Move include and
source files to logical locations"). At that time, there weren't too
many headers so it wasn't a real issue. However, time has shown that
this creates problems.
Platforms that want to preserve the way they include headers may add the
removed paths to PLAT_INCLUDES, but this is discouraged.
Change-Id: I39dc53ed98f9e297a5966e723d1936d6ccf2fc8f
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'plat/xilinx')
34 files changed, 141 insertions, 98 deletions
diff --git a/plat/xilinx/versal/aarch64/versal_common.c b/plat/xilinx/versal/aarch64/versal_common.c index c13b1b52..587b797d 100644 --- a/plat/xilinx/versal/aarch64/versal_common.c +++ b/plat/xilinx/versal/aarch64/versal_common.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <debug.h> -#include <generic_delay_timer.h> -#include <mmio.h> -#include <platform.h> -#include <xlat_tables.h> +#include <common/debug.h> +#include <drivers/generic_delay_timer.h> +#include <lib/mmio.h> +#include <lib/xlat_tables/xlat_tables.h> +#include <plat/common/platform.h> + #include "../versal_def.h" #include "../versal_private.h" diff --git a/plat/xilinx/versal/aarch64/versal_helpers.S b/plat/xilinx/versal/aarch64/versal_helpers.S index 1b7f9559..26eb0522 100644 --- a/plat/xilinx/versal/aarch64/versal_helpers.S +++ b/plat/xilinx/versal/aarch64/versal_helpers.S @@ -6,7 +6,7 @@ #include <arch.h> #include <asm_macros.S> -#include <gicv3.h> +#include <drivers/arm/gicv3.h> #include <platform_def.h> .globl plat_secondary_cold_boot_setup diff --git a/plat/xilinx/versal/bl31_versal_setup.c b/plat/xilinx/versal/bl31_versal_setup.c index 9f71a1cc..d7e07e03 100644 --- a/plat/xilinx/versal/bl31_versal_setup.c +++ b/plat/xilinx/versal/bl31_versal_setup.c @@ -5,14 +5,16 @@ */ #include <assert.h> -#include <bl_common.h> -#include <bl31.h> -#include <console.h> -#include <debug.h> #include <errno.h> -#include <platform.h> -#include <pl011.h> -#include <xlat_tables.h> + +#include <bl31/bl31.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <drivers/arm/pl011.h> +#include <drivers/console.h> +#include <lib/xlat_tables/xlat_tables.h> +#include <plat/common/platform.h> + #include "versal_private.h" static entry_point_info_t bl32_image_ep_info; diff --git a/plat/xilinx/versal/include/plat_macros.S b/plat/xilinx/versal/include/plat_macros.S index 4fc1315b..3a522122 100644 --- a/plat/xilinx/versal/include/plat_macros.S +++ b/plat/xilinx/versal/include/plat_macros.S @@ -7,10 +7,11 @@ #ifndef PLAT_MACROS_S #define PLAT_MACROS_S +#include <drivers/arm/gic_common.h> +#include <drivers/arm/gicv2.h> +#include <drivers/arm/gicv3.h> + #include "../include/platform_def.h" -#include <gic_common.h> -#include <gicv2.h> -#include <gicv3.h> .section .rodata.gic_reg_name, "aS" /* Applicable only to GICv2 and GICv3 with SRE disabled (legacy mode) */ diff --git a/plat/xilinx/versal/include/platform_def.h b/plat/xilinx/versal/include/platform_def.h index 45aaa84b..0c4b9544 100644 --- a/plat/xilinx/versal/include/platform_def.h +++ b/plat/xilinx/versal/include/platform_def.h @@ -8,6 +8,7 @@ #define PLATFORM_DEF_H #include <arch.h> + #include "../versal_def.h" /******************************************************************************* diff --git a/plat/xilinx/versal/plat_psci.c b/plat/xilinx/versal/plat_psci.c index 37d00f66..4a443697 100644 --- a/plat/xilinx/versal/plat_psci.c +++ b/plat/xilinx/versal/plat_psci.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <debug.h> -#include <mmio.h> -#include <platform.h> -#include <psci.h> +#include <common/debug.h> +#include <lib/mmio.h> +#include <lib/psci/psci.h> +#include <plat/common/platform.h> + #include "versal_private.h" static uintptr_t versal_sec_entry; diff --git a/plat/xilinx/versal/plat_versal.c b/plat/xilinx/versal/plat_versal.c index 152cb362..642867da 100644 --- a/plat/xilinx/versal/plat_versal.c +++ b/plat/xilinx/versal/plat_versal.c @@ -3,7 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include <platform.h> + +#include <plat/common/platform.h> + #include "versal_private.h" int plat_core_pos_by_mpidr(u_register_t mpidr) diff --git a/plat/xilinx/versal/sip_svc_setup.c b/plat/xilinx/versal/sip_svc_setup.c index 4007d5c8..8f2180b2 100644 --- a/plat/xilinx/versal/sip_svc_setup.c +++ b/plat/xilinx/versal/sip_svc_setup.c @@ -6,9 +6,9 @@ /* Top level SMC handler for SiP calls. Dispatch PM calls to PM SMC handler. */ -#include <debug.h> -#include <runtime_svc.h> -#include <uuid.h> +#include <common/debug.h> +#include <common/runtime_svc.h> +#include <tools_share/uuid.h> /* SMC function IDs for SiP Service queries */ #define VERSAL_SIP_SVC_CALL_COUNT 0x8200ff00 diff --git a/plat/xilinx/versal/versal_def.h b/plat/xilinx/versal/versal_def.h index 5e42bd78..41c65b94 100644 --- a/plat/xilinx/versal/versal_def.h +++ b/plat/xilinx/versal/versal_def.h @@ -7,7 +7,7 @@ #ifndef VERSAL_DEF_H #define VERSAL_DEF_H -#include <common_def.h> +#include <plat/common/common_def.h> /* List all consoles */ #define VERSAL_CONSOLE_ID_pl011 1 diff --git a/plat/xilinx/versal/versal_gicv3.c b/plat/xilinx/versal/versal_gicv3.c index 72374b53..dcf23b42 100644 --- a/plat/xilinx/versal/versal_gicv3.c +++ b/plat/xilinx/versal/versal_gicv3.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <gicv3.h> -#include <interrupt_props.h> -#include <platform.h> #include <platform_def.h> -#include <utils.h> + +#include <common/interrupt_props.h> +#include <drivers/arm/gicv3.h> +#include <lib/utils.h> +#include <plat/common/platform.h> + #include "versal_private.h" /****************************************************************************** diff --git a/plat/xilinx/versal/versal_private.h b/plat/xilinx/versal/versal_private.h index 1e30ebc2..5d98d080 100644 --- a/plat/xilinx/versal/versal_private.h +++ b/plat/xilinx/versal/versal_private.h @@ -7,7 +7,7 @@ #ifndef VERSAL_PRIVATE_H #define VERSAL_PRIVATE_H -#include <xlat_tables.h> +#include <lib/xlat_tables/xlat_tables.h> void versal_config_setup(void); diff --git a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c index 2f4228fe..23c02e06 100644 --- a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c +++ b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <debug.h> -#include <generic_delay_timer.h> -#include <mmio.h> -#include <platform.h> #include <stdbool.h> #include <string.h> -#include <xlat_tables.h> + +#include <common/debug.h> +#include <drivers/generic_delay_timer.h> +#include <lib/mmio.h> +#include <lib/xlat_tables/xlat_tables.h> +#include <plat/common/platform.h> + #include "../zynqmp_private.h" #include "pm_api_sys.h" diff --git a/plat/xilinx/zynqmp/aarch64/zynqmp_helpers.S b/plat/xilinx/zynqmp/aarch64/zynqmp_helpers.S index 969d8faa..8d816653 100644 --- a/plat/xilinx/zynqmp/aarch64/zynqmp_helpers.S +++ b/plat/xilinx/zynqmp/aarch64/zynqmp_helpers.S @@ -5,7 +5,7 @@ */ #include <asm_macros.S> -#include <gicv2.h> +#include <drivers/arm/gicv2.h> #include <platform_def.h> .globl plat_secondary_cold_boot_setup diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index 01634500..01cd781f 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -5,13 +5,15 @@ */ #include <assert.h> -#include <bl31.h> -#include <bl_common.h> -#include <console.h> -#include <debug.h> #include <errno.h> + +#include <bl31/bl31.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <drivers/console.h> #include <plat_arm.h> -#include <platform.h> +#include <plat/common/platform.h> + #include "zynqmp_private.h" #define BL31_END (unsigned long)(&__BL31_END__) diff --git a/plat/xilinx/zynqmp/include/platform_def.h b/plat/xilinx/zynqmp/include/platform_def.h index d721778d..e3c9fcc1 100644 --- a/plat/xilinx/zynqmp/include/platform_def.h +++ b/plat/xilinx/zynqmp/include/platform_def.h @@ -8,9 +8,10 @@ #define PLATFORM_DEF_H #include <arch.h> -#include <gic_common.h> -#include <interrupt_props.h> -#include <utils_def.h> +#include <common/interrupt_props.h> +#include <drivers/arm/gic_common.h> +#include <lib/utils_def.h> + #include "../zynqmp_def.h" /******************************************************************************* diff --git a/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c b/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c index bfc19d33..11f382a0 100644 --- a/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c +++ b/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c @@ -8,12 +8,14 @@ * Top-level SMC handler for ZynqMP IPI Mailbox doorbell functions. */ -#include <bakery_lock.h> -#include <debug.h> #include <errno.h> -#include <mmio.h> -#include <runtime_svc.h> #include <string.h> + +#include <common/debug.h> +#include <common/runtime_svc.h> +#include <lib/bakery_lock.h> +#include <lib/mmio.h> + #include "ipi_mailbox_svc.h" #include "../zynqmp_ipi.h" #include "../zynqmp_private.h" diff --git a/plat/xilinx/zynqmp/plat_psci.c b/plat/xilinx/zynqmp/plat_psci.c index a82f6967..4183979a 100644 --- a/plat/xilinx/zynqmp/plat_psci.c +++ b/plat/xilinx/zynqmp/plat_psci.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <debug.h> #include <errno.h> -#include <gicv2.h> -#include <mmio.h> + +#include <arch_helpers.h> +#include <common/debug.h> +#include <drivers/arm/gicv2.h> +#include <lib/mmio.h> +#include <lib/psci/psci.h> +#include <plat/common/platform.h> + #include <plat_arm.h> -#include <platform.h> -#include <psci.h> #include "pm_api_sys.h" #include "pm_client.h" #include "zynqmp_private.h" diff --git a/plat/xilinx/zynqmp/plat_startup.c b/plat/xilinx/zynqmp/plat_startup.c index d3e182ca..03f0e3d8 100644 --- a/plat/xilinx/zynqmp/plat_startup.c +++ b/plat/xilinx/zynqmp/plat_startup.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <debug.h> -#include <mmio.h> + +#include <arch_helpers.h> +#include <common/debug.h> +#include <lib/mmio.h> + #include "zynqmp_def.h" #include "zynqmp_private.h" diff --git a/plat/xilinx/zynqmp/plat_zynqmp.c b/plat/xilinx/zynqmp/plat_zynqmp.c index 2441630b..ad18aafc 100644 --- a/plat/xilinx/zynqmp/plat_zynqmp.c +++ b/plat/xilinx/zynqmp/plat_zynqmp.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <platform.h> +#include <plat/common/platform.h> + #include "zynqmp_private.h" int plat_core_pos_by_mpidr(u_register_t mpidr) diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_clock.c b/plat/xilinx/zynqmp/pm_service/pm_api_clock.c index b175b78b..04a58b48 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_clock.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_clock.c @@ -8,11 +8,13 @@ * ZynqMP system level PM-API functions for clock control. */ -#include <arch_helpers.h> -#include <mmio.h> -#include <platform.h> #include <stdbool.h> #include <string.h> + +#include <arch_helpers.h> +#include <lib/mmio.h> +#include <plat/common/platform.h> + #include "pm_api_clock.h" #include "pm_api_sys.h" #include "pm_client.h" diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h index f7cbdbaf..44e9773d 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_clock.h +++ b/plat/xilinx/zynqmp/pm_service/pm_api_clock.h @@ -11,7 +11,8 @@ #ifndef PM_API_CLOCK_H #define PM_API_CLOCK_H -#include <utils_def.h> +#include <lib/utils_def.h> + #include "pm_common.h" #define CLK_NAME_LEN U(15) diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c index 16c08ae6..fd9d7c07 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_ioctl.c @@ -9,9 +9,10 @@ */ #include <arch_helpers.h> -#include <delay_timer.h> -#include <mmio.h> -#include <platform.h> +#include <drivers/delay_timer.h> +#include <lib/mmio.h> +#include <plat/common/platform.h> + #include "pm_api_clock.h" #include "pm_api_ioctl.h" #include "pm_api_sys.h" diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c b/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c index 12b9c2d2..a900057e 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_pinctrl.c @@ -8,9 +8,11 @@ * ZynqMP system level PM-API functions for pin control. */ -#include <arch_helpers.h> -#include <platform.h> #include <string.h> + +#include <arch_helpers.h> +#include <plat/common/platform.h> + #include "pm_api_pinctrl.h" #include "pm_api_sys.h" #include "pm_client.h" diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_sys.c b/plat/xilinx/zynqmp/pm_service/pm_api_sys.c index e85b2cee..974dbb3d 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_sys.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_sys.c @@ -10,7 +10,8 @@ */ #include <arch_helpers.h> -#include <platform.h> +#include <plat/common/platform.h> + #include "pm_api_clock.h" #include "pm_api_ioctl.h" #include "pm_api_pinctrl.h" diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_sys.h b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h index fee91cdd..a0040cf8 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_sys.h +++ b/plat/xilinx/zynqmp/pm_service/pm_api_sys.h @@ -8,6 +8,7 @@ #define PM_API_SYS_H #include <stdint.h> + #include "pm_defs.h" enum pm_query_id { diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.c b/plat/xilinx/zynqmp/pm_service/pm_client.c index 874b8a9e..bebb74ce 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_client.c +++ b/plat/xilinx/zynqmp/pm_service/pm_client.c @@ -10,13 +10,15 @@ */ #include <assert.h> -#include <bakery_lock.h> -#include <bl_common.h> -#include <gic_common.h> -#include <gicv2.h> -#include <mmio.h> #include <string.h> -#include <utils.h> + +#include <common/bl_common.h> +#include <drivers/arm/gic_common.h> +#include <drivers/arm/gicv2.h> +#include <lib/bakery_lock.h> +#include <lib/mmio.h> +#include <lib/utils.h> + #include "../zynqmp_def.h" #include "pm_api_sys.h" #include "pm_client.h" diff --git a/plat/xilinx/zynqmp/pm_service/pm_common.h b/plat/xilinx/zynqmp/pm_service/pm_common.h index 54746271..94e0568f 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_common.h +++ b/plat/xilinx/zynqmp/pm_service/pm_common.h @@ -12,8 +12,10 @@ #ifndef PM_COMMON_H #define PM_COMMON_H -#include <debug.h> #include <stdint.h> + +#include <common/debug.h> + #include "pm_defs.h" #define PAYLOAD_ARG_CNT 6U diff --git a/plat/xilinx/zynqmp/pm_service/pm_ipi.c b/plat/xilinx/zynqmp/pm_service/pm_ipi.c index dc1ea4d1..b3d833df 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_ipi.c +++ b/plat/xilinx/zynqmp/pm_service/pm_ipi.c @@ -5,9 +5,10 @@ */ #include <arch_helpers.h> -#include <bakery_lock.h> -#include <mmio.h> -#include <platform.h> +#include <lib/bakery_lock.h> +#include <lib/mmio.h> +#include <plat/common/platform.h> + #include "../zynqmp_ipi.h" #include "../zynqmp_private.h" #include "pm_ipi.h" diff --git a/plat/xilinx/zynqmp/pm_service/pm_svc_main.c b/plat/xilinx/zynqmp/pm_service/pm_svc_main.c index 7790c979..c8859155 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_svc_main.c +++ b/plat/xilinx/zynqmp/pm_service/pm_svc_main.c @@ -10,18 +10,20 @@ */ #include <errno.h> -#include <runtime_svc.h> + +#include <common/runtime_svc.h> +#if ZYNQMP_WDT_RESTART +#include <arch_helpers.h> +#include <drivers/arm/gicv2.h> +#include <lib/mmio.h> +#include <lib/spinlock.h> +#include <plat/common/platform.h> +#endif + #include "../zynqmp_private.h" #include "pm_api_sys.h" #include "pm_client.h" #include "pm_ipi.h" -#if ZYNQMP_WDT_RESTART -#include <arch_helpers.h> -#include <gicv2.h> -#include <mmio.h> -#include <platform.h> -#include <spinlock.h> -#endif #define PM_SET_SUSPEND_MODE 0xa02 #define PM_GET_TRUSTZONE_VERSION 0xa03 diff --git a/plat/xilinx/zynqmp/sip_svc_setup.c b/plat/xilinx/zynqmp/sip_svc_setup.c index 9fe709db..8d23a014 100644 --- a/plat/xilinx/zynqmp/sip_svc_setup.c +++ b/plat/xilinx/zynqmp/sip_svc_setup.c @@ -6,8 +6,9 @@ /* Top level SMC handler for SiP calls. Dispatch PM calls to PM SMC handler. */ -#include <runtime_svc.h> -#include <uuid.h> +#include <common/runtime_svc.h> +#include <tools_share/uuid.h> + #include "ipi_mailbox_svc.h" #include "pm_svc_main.h" #include "zynqmp_ipi.h" diff --git a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c index a27f34b4..25359f91 100644 --- a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c +++ b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <bl_common.h> -#include <console.h> -#include <debug.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <drivers/console.h> + #include <plat_arm.h> #include <platform_tsp.h> + #include "../zynqmp_private.h" #define BL32_END (unsigned long)(&__BL32_END__) diff --git a/plat/xilinx/zynqmp/zynqmp_def.h b/plat/xilinx/zynqmp/zynqmp_def.h index ba382dd8..f75530e7 100644 --- a/plat/xilinx/zynqmp/zynqmp_def.h +++ b/plat/xilinx/zynqmp/zynqmp_def.h @@ -7,7 +7,7 @@ #ifndef ZYNQMP_DEF_H #define ZYNQMP_DEF_H -#include <common_def.h> +#include <plat/common/common_def.h> #define ZYNQMP_CONSOLE_ID_cadence 1 #define ZYNQMP_CONSOLE_ID_cadence0 1 diff --git a/plat/xilinx/zynqmp/zynqmp_ipi.c b/plat/xilinx/zynqmp/zynqmp_ipi.c index 5038f847..54b18380 100644 --- a/plat/xilinx/zynqmp/zynqmp_ipi.c +++ b/plat/xilinx/zynqmp/zynqmp_ipi.c @@ -8,12 +8,14 @@ * Zynq UltraScale+ MPSoC IPI agent registers access management */ -#include <bakery_lock.h> -#include <debug.h> #include <errno.h> -#include <mmio.h> -#include <runtime_svc.h> #include <string.h> + +#include <common/debug.h> +#include <common/runtime_svc.h> +#include <lib/bakery_lock.h> +#include <lib/mmio.h> + #include "zynqmp_ipi.h" #include "../zynqmp_private.h" diff --git a/plat/xilinx/zynqmp/zynqmp_private.h b/plat/xilinx/zynqmp/zynqmp_private.h index 8a8d38ab..a8ebcebe 100644 --- a/plat/xilinx/zynqmp/zynqmp_private.h +++ b/plat/xilinx/zynqmp/zynqmp_private.h @@ -7,10 +7,11 @@ #ifndef ZYNQMP_PRIVATE_H #define ZYNQMP_PRIVATE_H -#include <bl_common.h> -#include <interrupt_mgmt.h> #include <stdint.h> +#include <bl31/interrupt_mgmt.h> +#include <common/bl_common.h> + void zynqmp_config_setup(void); unsigned int zynqmp_calc_core_pos(u_register_t mpidr); |