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>
diff --git a/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c b/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c
index 8ce1e4f..4c664d1 100644
--- a/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c
+++ b/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c
@@ -6,12 +6,12 @@
#include <arch_helpers.h>
#include <assert.h>
+#include <debug.h>
#include <hi3660.h>
+#include <hisi_ipc.h>
#include <mmio.h>
#include <platform.h>
#include <platform_def.h>
-#include <hisi_ipc.h>
-#include <debug.h>
#include "../../hikey960_private.h"
diff --git a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c b/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c
index f82144a..9fdc3e7 100644
--- a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c
+++ b/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c
@@ -4,13 +4,15 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
+#include <../hikey960_def.h>
#include <arch_helpers.h>
#include <assert.h>
+#include <hisi_ipc.h>
#include <mmio.h>
#include <platform.h>
#include <platform_def.h>
-#include <../hikey960_def.h>
-#include <hisi_ipc.h>
+
+
#include "hisi_pwrc.h"
diff --git a/plat/hisilicon/hikey960/hikey960_bl1_setup.c b/plat/hisilicon/hikey960/hikey960_bl1_setup.c
index f9666df..54e7347 100644
--- a/plat/hisilicon/hikey960/hikey960_bl1_setup.c
+++ b/plat/hisilicon/hikey960/hikey960_bl1_setup.c
@@ -13,10 +13,10 @@
#include <delay_timer.h>
#include <dw_ufs.h>
#include <errno.h>
+#include <generic_delay_timer.h>
#include <gicv2.h>
#include <hi3660.h>
#include <mmio.h>
-#include <generic_delay_timer.h>
#include <platform.h>
#include <platform_def.h>
#include <string.h>
diff --git a/plat/hisilicon/hikey960/include/plat_macros.S b/plat/hisilicon/hikey960/include/plat_macros.S
index 9f1befd..5137f9e 100644
--- a/plat/hisilicon/hikey960/include/plat_macros.S
+++ b/plat/hisilicon/hikey960/include/plat_macros.S
@@ -8,8 +8,8 @@
#define __PLAT_MACROS_S__
#include <cci.h>
-#include <hi3660.h>
#include <gic_v2.h>
+#include <hi3660.h>
#include <platform_def.h>
.section .rodata.gic_reg_name, "aS"