diff options
Diffstat (limited to 'plat/xilinx/zynqmp')
23 files changed, 101 insertions, 68 deletions
diff --git a/plat/xilinx/zynqmp/aarch64/zynqmp_common.c b/plat/xilinx/zynqmp/aarch64/zynqmp_common.c index 2f4228fea..23c02e068 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 969d8faa1..8d8166538 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 01634500a..01cd781ff 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 d721778d3..e3c9fcc17 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 bfc19d339..11f382a05 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 a82f69677..4183979a2 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 d3e182cac..03f0e3d82 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 2441630bd..ad18aafc3 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 b175b78b3..04a58b488 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 f7cbdbaf0..44e9773d0 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 16c08ae6d..fd9d7c070 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 12b9c2d29..a900057e8 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 e85b2cee3..974dbb3d7 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 fee91cdd9..a0040cf8d 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 874b8a9ea..bebb74ce7 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 54746271f..94e0568f6 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 dc1ea4d12..b3d833dfe 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 7790c979d..c88591552 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 9fe709db9..8d23a014c 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 a27f34b45..25359f91a 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 ba382dd8b..f75530e7f 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 5038f8477..54b18380d 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 8a8d38abf..a8ebcebee 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); |