diff options
| -rw-r--r-- | plat/xilinx/zynqmp/include/plat_ipi.h (renamed from plat/xilinx/zynqmp/zynqmp_ipi.h) | 8 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c | 2 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/pm_service/pm_ipi.c | 2 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/sip_svc_setup.c | 4 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/zynqmp_ipi.c | 3 |
5 files changed, 9 insertions, 10 deletions
diff --git a/plat/xilinx/zynqmp/zynqmp_ipi.h b/plat/xilinx/zynqmp/include/plat_ipi.h index b9b40dde..6d036afc 100644 --- a/plat/xilinx/zynqmp/zynqmp_ipi.h +++ b/plat/xilinx/zynqmp/include/plat_ipi.h @@ -1,13 +1,13 @@ /* - * Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ /* ZynqMP IPI management enums and defines */ -#ifndef ZYNQMP_IPI_H -#define ZYNQMP_IPI_H +#ifndef PLAT_IPI_H +#define PLAT_IPI_H #include <stdint.h> @@ -67,4 +67,4 @@ void ipi_mb_disable_irq(uint32_t local, uint32_t remote); /* Enable IPI mailbox notification interrupt */ void ipi_mb_enable_irq(uint32_t local, uint32_t remote); -#endif /* ZYNQMP_IPI_H */ +#endif /* PLAT_IPI_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 3aa0b75d..932d1e74 100644 --- a/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c +++ b/plat/xilinx/zynqmp/ipi_mailbox_service/ipi_mailbox_svc.c @@ -15,10 +15,10 @@ #include <common/runtime_svc.h> #include <lib/bakery_lock.h> #include <lib/mmio.h> +#include <plat_ipi.h> #include <plat_private.h> #include "ipi_mailbox_svc.h" -#include "../zynqmp_ipi.h" #include "../../../services/spd/trusty/smcall.h" /********************************************************************* diff --git a/plat/xilinx/zynqmp/pm_service/pm_ipi.c b/plat/xilinx/zynqmp/pm_service/pm_ipi.c index 66393ef3..88e23f09 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_ipi.c +++ b/plat/xilinx/zynqmp/pm_service/pm_ipi.c @@ -7,10 +7,10 @@ #include <arch_helpers.h> #include <lib/bakery_lock.h> #include <lib/mmio.h> +#include <plat_ipi.h> #include <plat_private.h> #include <plat/common/platform.h> -#include "../zynqmp_ipi.h" #include "pm_ipi.h" /* IPI message buffers */ diff --git a/plat/xilinx/zynqmp/sip_svc_setup.c b/plat/xilinx/zynqmp/sip_svc_setup.c index 8d23a014..5b876798 100644 --- a/plat/xilinx/zynqmp/sip_svc_setup.c +++ b/plat/xilinx/zynqmp/sip_svc_setup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -9,9 +9,9 @@ #include <common/runtime_svc.h> #include <tools_share/uuid.h> +#include <plat_ipi.h> #include "ipi_mailbox_svc.h" #include "pm_svc_main.h" -#include "zynqmp_ipi.h" /* SMC function IDs for SiP Service queries */ #define ZYNQMP_SIP_SVC_CALL_COUNT 0x8200ff00 diff --git a/plat/xilinx/zynqmp/zynqmp_ipi.c b/plat/xilinx/zynqmp/zynqmp_ipi.c index 2830ea3a..96f2b9c3 100644 --- a/plat/xilinx/zynqmp/zynqmp_ipi.c +++ b/plat/xilinx/zynqmp/zynqmp_ipi.c @@ -15,10 +15,9 @@ #include <common/runtime_svc.h> #include <lib/bakery_lock.h> #include <lib/mmio.h> +#include <plat_ipi.h> #include <plat_private.h> -#include "zynqmp_ipi.h" - /********************************************************************* * Macros definitions ********************************************************************/ |