diff options
author | Isla Mitchell <isla.mitchell@arm.com> | 2017-07-14 10:46:32 +0100 |
---|---|---|
committer | Isla Mitchell <isla.mitchell@arm.com> | 2017-07-14 10:50:41 +0100 |
commit | ee1ebbd18e2a1e3b8a5b9ac9fba155177e2af4a1 (patch) | |
tree | 70883b9cbed5cbc7d9283d9d1cd5972479fc884e /plat/xilinx | |
parent | 4adb10c1ede9773ce018ddb3b56f5eb900f220f8 (diff) |
Fix order of remaining platform #includes
This fix modifies the order of system includes to meet the ARM TF coding
standard. There are some exceptions to this change in order to retain
header groupings and where there are headers within #if statements.
Change-Id: Ib5b668c992d817cc860e97b29e16ef106d17e404
Signed-off-by: Isla Mitchell <isla.mitchell@arm.com>
Diffstat (limited to 'plat/xilinx')
-rw-r--r-- | plat/xilinx/zynqmp/bl31_zynqmp_setup.c | 2 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/plat_psci.c | 2 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/pm_service/pm_api_sys.c | 4 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/pm_service/pm_client.c | 6 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/pm_service/pm_client.h | 2 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/pm_service/pm_ipi.c | 4 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/pm_service/pm_svc_main.c | 2 | ||||
-rw-r--r-- | plat/xilinx/zynqmp/tsp/tsp_plat_setup.c | 2 |
8 files changed, 12 insertions, 12 deletions
diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index 61372291..1edbd0f6 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -5,8 +5,8 @@ */ #include <assert.h> -#include <bl_common.h> #include <bl31.h> +#include <bl_common.h> #include <console.h> #include <debug.h> #include <errno.h> diff --git a/plat/xilinx/zynqmp/plat_psci.c b/plat/xilinx/zynqmp/plat_psci.c index d334a104..c9fd3611 100644 --- a/plat/xilinx/zynqmp/plat_psci.c +++ b/plat/xilinx/zynqmp/plat_psci.c @@ -5,9 +5,9 @@ */ #include <arch_helpers.h> -#include <errno.h> #include <assert.h> #include <debug.h> +#include <errno.h> #include <gicv2.h> #include <mmio.h> #include <plat_arm.h> diff --git a/plat/xilinx/zynqmp/pm_service/pm_api_sys.c b/plat/xilinx/zynqmp/pm_service/pm_api_sys.c index 40f4da73..90c670d1 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_api_sys.c +++ b/plat/xilinx/zynqmp/pm_service/pm_api_sys.c @@ -11,10 +11,10 @@ #include <arch_helpers.h> #include <platform.h> +#include "pm_api_sys.h" #include "pm_client.h" -#include "pm_ipi.h" #include "pm_common.h" -#include "pm_api_sys.h" +#include "pm_ipi.h" /** * Assigning of argument values into array elements. diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.c b/plat/xilinx/zynqmp/pm_service/pm_client.c index 08369b99..9016fd6f 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_client.c +++ b/plat/xilinx/zynqmp/pm_service/pm_client.c @@ -11,16 +11,16 @@ #include <assert.h> #include <bakery_lock.h> -#include <gicv2.h> -#include <gic_common.h> #include <bl_common.h> +#include <gic_common.h> +#include <gicv2.h> #include <mmio.h> #include <string.h> #include <utils.h> +#include "../zynqmp_def.h" #include "pm_api_sys.h" #include "pm_client.h" #include "pm_ipi.h" -#include "../zynqmp_def.h" #define IRQ_MAX 84 #define NUM_GICD_ISENABLER ((IRQ_MAX >> 5) + 1) diff --git a/plat/xilinx/zynqmp/pm_service/pm_client.h b/plat/xilinx/zynqmp/pm_service/pm_client.h index 03dec4c4..16e37d59 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_client.h +++ b/plat/xilinx/zynqmp/pm_service/pm_client.h @@ -12,8 +12,8 @@ #ifndef _PM_CLIENT_H_ #define _PM_CLIENT_H_ -#include "pm_defs.h" #include "pm_common.h" +#include "pm_defs.h" /* Functions to be implemented by each PU */ void pm_client_suspend(const struct pm_proc *proc, unsigned int state); diff --git a/plat/xilinx/zynqmp/pm_service/pm_ipi.c b/plat/xilinx/zynqmp/pm_service/pm_ipi.c index ba72491c..fdffde77 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_ipi.c +++ b/plat/xilinx/zynqmp/pm_service/pm_ipi.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <arch_helpers.h> #include <bakery_lock.h> #include <mmio.h> #include <platform.h> -#include <arch_helpers.h> -#include "pm_ipi.h" #include "../zynqmp_private.h" +#include "pm_ipi.h" /* IPI message buffers */ #define IPI_BUFFER_BASEADDR 0xFF990000U diff --git a/plat/xilinx/zynqmp/pm_service/pm_svc_main.c b/plat/xilinx/zynqmp/pm_service/pm_svc_main.c index b8381712..f4e679bc 100644 --- a/plat/xilinx/zynqmp/pm_service/pm_svc_main.c +++ b/plat/xilinx/zynqmp/pm_service/pm_svc_main.c @@ -13,10 +13,10 @@ #include <gic_common.h> #include <runtime_svc.h> #include <string.h> +#include "../zynqmp_private.h" #include "pm_api_sys.h" #include "pm_client.h" #include "pm_ipi.h" -#include "../zynqmp_private.h" #define PM_GET_CALLBACK_DATA 0xa01 diff --git a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c index 27736f75..ecc4d0a9 100644 --- a/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c +++ b/plat/xilinx/zynqmp/tsp/tsp_plat_setup.c @@ -7,8 +7,8 @@ #include <bl_common.h> #include <console.h> #include <debug.h> -#include <platform_tsp.h> #include <plat_arm.h> +#include <platform_tsp.h> #include "../zynqmp_private.h" #define BL32_END (unsigned long)(&__BL32_END__) |