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/rockchip/common/aarch64/platform_common.c b/plat/rockchip/common/aarch64/platform_common.c
index a756f40..25eab43 100644
--- a/plat/rockchip/common/aarch64/platform_common.c
+++ b/plat/rockchip/common/aarch64/platform_common.c
@@ -9,11 +9,11 @@
#include <bl_common.h>
#include <cci.h>
#include <debug.h>
-#include <string.h>
-#include <xlat_tables.h>
-#include <platform_def.h>
#include <plat_private.h>
+#include <platform_def.h>
+#include <string.h>
#include <utils.h>
+#include <xlat_tables.h>
#ifdef PLAT_RK_CCI_BASE
static const int cci_map[] = {
diff --git a/plat/rockchip/common/bl31_plat_setup.c b/plat/rockchip/common/bl31_plat_setup.c
index f7564e8..292f0dd 100644
--- a/plat/rockchip/common/bl31_plat_setup.c
+++ b/plat/rockchip/common/bl31_plat_setup.c
@@ -11,8 +11,8 @@
#include <debug.h>
#include <generic_delay_timer.h>
#include <mmio.h>
-#include <platform.h>
#include <plat_private.h>
+#include <platform.h>
#include <platform_def.h>
/*******************************************************************************
diff --git a/plat/rockchip/common/drivers/parameter/ddr_parameter.c b/plat/rockchip/common/drivers/parameter/ddr_parameter.c
index 5069a92..ea77757 100644
--- a/plat/rockchip/common/drivers/parameter/ddr_parameter.c
+++ b/plat/rockchip/common/drivers/parameter/ddr_parameter.c
@@ -9,8 +9,8 @@
#include <debug.h>
#include <delay_timer.h>
#include <mmio.h>
-#include <platform_def.h>
#include <plat_private.h>
+#include <platform_def.h>
#include <soc.h>
#include <string.h>
#include "ddr_parameter.h"
diff --git a/plat/rockchip/common/drivers/parameter/ddr_parameter.h b/plat/rockchip/common/drivers/parameter/ddr_parameter.h
index f8eacd4..f8e3be9 100644
--- a/plat/rockchip/common/drivers/parameter/ddr_parameter.h
+++ b/plat/rockchip/common/drivers/parameter/ddr_parameter.h
@@ -12,8 +12,8 @@
#include <debug.h>
#include <delay_timer.h>
#include <mmio.h>
-#include <platform_def.h>
#include <plat_private.h>
+#include <platform_def.h>
#include <soc.h>
#include <string.h>
diff --git a/plat/rockchip/common/include/plat_private.h b/plat/rockchip/common/include/plat_private.h
index b9540f2..290811a 100644
--- a/plat/rockchip/common/include/plat_private.h
+++ b/plat/rockchip/common/include/plat_private.h
@@ -9,9 +9,9 @@
#ifndef __ASSEMBLY__
#include <mmio.h>
+#include <psci.h>
#include <stdint.h>
#include <xlat_tables.h>
-#include <psci.h>
#define __sramdata __attribute__((section(".sram.data")))
#define __sramconst __attribute__((section(".sram.rodata")))
diff --git a/plat/rockchip/common/params_setup.c b/plat/rockchip/common/params_setup.c
index ad4ef7f..b37acb7 100644
--- a/plat/rockchip/common/params_setup.c
+++ b/plat/rockchip/common/params_setup.c
@@ -11,9 +11,9 @@
#include <debug.h>
#include <gpio.h>
#include <mmio.h>
-#include <platform.h>
#include <plat_params.h>
#include <plat_private.h>
+#include <platform.h>
#include <string.h>
static struct gpio_info param_reset;
diff --git a/plat/rockchip/common/plat_pm.c b/plat/rockchip/common/plat_pm.c
index 4133fd0..cd88f60 100644
--- a/plat/rockchip/common/plat_pm.c
+++ b/plat/rockchip/common/plat_pm.c
@@ -7,12 +7,12 @@
#include <arch_helpers.h>
#include <assert.h>
#include <console.h>
-#include <errno.h>
#include <debug.h>
-#include <psci.h>
#include <delay_timer.h>
-#include <platform_def.h>
+#include <errno.h>
#include <plat_private.h>
+#include <platform_def.h>
+#include <psci.h>
/* Macros to read the rk power domain state */
#define RK_CORE_PWR_STATE(state) \
diff --git a/plat/rockchip/common/plat_topology.c b/plat/rockchip/common/plat_topology.c
index 3d0f208..49d063c 100644
--- a/plat/rockchip/common/plat_topology.c
+++ b/plat/rockchip/common/plat_topology.c
@@ -5,8 +5,8 @@
*/
#include <arch.h>
-#include <platform_def.h>
#include <plat_private.h>
+#include <platform_def.h>
#include <psci.h>
/*******************************************************************************