amlogic: Fix includes order

As part of the code refactoring fix the order of the include files
across all the source files.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
Change-Id: Ice72f687cc26ee881a9051168149467688100cfb

diff --git a/plat/amlogic/gxbb/gxbb_bl31_setup.c b/plat/amlogic/gxbb/gxbb_bl31_setup.c
index 6d6b2ad702cf2083b8790848dd4d1ea5043a92aa..cc7a1c49bf5df18d225700f19cc511bb4df52dd6 100644 (file)
--- a/plat/amlogic/gxbb/gxbb_bl31_setup.c
+++ b/plat/amlogic/gxbb/gxbb_bl31_setup.c
@@ -5,14 +5,12 @@
  */
 
 #include <assert.h>
-
-#include <platform_def.h>
-
 #include <common/bl_common.h>
 #include <common/interrupt_props.h>
 #include <drivers/arm/gicv2.h>
 #include <lib/xlat_tables/xlat_mmu_helpers.h>
 #include <plat/common/platform.h>
+#include <platform_def.h>
 
 #include "aml_private.h"
 

diff --git a/plat/amlogic/gxbb/gxbb_common.c b/plat/amlogic/gxbb/gxbb_common.c
index 831bc66e57d0247fdabec8bd125a63c645bb9009..e98748e777a2c1c3a20eaa6ea0b2c5e4d3f0158a 100644 (file)
--- a/plat/amlogic/gxbb/gxbb_common.c
+++ b/plat/amlogic/gxbb/gxbb_common.c
@@ -5,10 +5,6 @@
  */
 
 #include <assert.h>
-#include <stdint.h>
-
-#include <platform_def.h>
-
 #include <bl31/interrupt_mgmt.h>
 #include <common/bl_common.h>
 #include <common/debug.h>
@@ -16,6 +12,8 @@
 #include <drivers/amlogic/meson_console.h>
 #include <lib/mmio.h>
 #include <lib/xlat_tables/xlat_tables_v2.h>
+#include <platform_def.h>
+#include <stdint.h>
 
 /*******************************************************************************
  * Platform memory map regions
@@ -36,8 +34,8 @@
                                        AML_SEC_DEVICE1_SIZE,           \
                                        MT_DEVICE | MT_RW | MT_SECURE)
 
-#define MAP_TZRAM      MAP_REGION_FLAT(AML_TZRAM_BASE,         \
-                                       AML_TZRAM_SIZE,         \
+#define MAP_TZRAM      MAP_REGION_FLAT(AML_TZRAM_BASE,                 \
+                                       AML_TZRAM_SIZE,                 \
                                        MT_DEVICE | MT_RW | MT_SECURE)
 
 #define MAP_SEC_DEVICE2        MAP_REGION_FLAT(AML_SEC_DEVICE2_BASE,           \

diff --git a/plat/amlogic/gxbb/gxbb_pm.c b/plat/amlogic/gxbb/gxbb_pm.c
index ed57fee47114d6cfcf6e6d19419988cc68ab5725..48bff7ba57bb8d0c436e86a04027069408df4f3f 100644 (file)
--- a/plat/amlogic/gxbb/gxbb_pm.c
+++ b/plat/amlogic/gxbb/gxbb_pm.c
@@ -4,18 +4,16 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <assert.h>
-#include <errno.h>
-
-#include <platform_def.h>
-
 #include <arch_helpers.h>
+#include <assert.h>
 #include <common/debug.h>
 #include <drivers/arm/gicv2.h>
 #include <drivers/console.h>
+#include <errno.h>
 #include <lib/mmio.h>
 #include <lib/psci/psci.h>
 #include <plat/common/platform.h>
+#include <platform_def.h>
 
 #include "aml_private.h"
 

diff --git a/plat/amlogic/gxl/gxl_bl31_setup.c b/plat/amlogic/gxl/gxl_bl31_setup.c
index 9c49646a9b3ffc0c6e8510c45864539bb015c42e..f581dd13453e09684ccff8f8c0cf9c7655fe63c4 100644 (file)
--- a/plat/amlogic/gxl/gxl_bl31_setup.c
+++ b/plat/amlogic/gxl/gxl_bl31_setup.c
@@ -6,12 +6,12 @@
 
 #include <assert.h>
 #include <common/bl_common.h>
-#include <drivers/arm/gicv2.h>
 #include <common/interrupt_props.h>
-#include <plat/common/platform.h>
-#include <platform_def.h>
+#include <drivers/arm/gicv2.h>
 #include <lib/mmio.h>
 #include <lib/xlat_tables/xlat_mmu_helpers.h>
+#include <plat/common/platform.h>
+#include <platform_def.h>
 
 #include "aml_private.h"
 

diff --git a/plat/amlogic/gxl/gxl_common.c b/plat/amlogic/gxl/gxl_common.c
index 631488846ee98fa7cf916b6e9ac03be9385919d4..468688538df0c6b44c1243c8adecc8b2df5c977b 100644 (file)
--- a/plat/amlogic/gxl/gxl_common.c
+++ b/plat/amlogic/gxl/gxl_common.c
@@ -5,15 +5,15 @@
  */
 
 #include <assert.h>
+#include <bl31/interrupt_mgmt.h>
 #include <common/bl_common.h>
 #include <common/debug.h>
 #include <common/ep_info.h>
-#include <bl31/interrupt_mgmt.h>
-#include <meson_console.h>
 #include <lib/mmio.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+#include <meson_console.h>
 #include <platform_def.h>
 #include <stdint.h>
-#include <lib/xlat_tables/xlat_tables_v2.h>
 
 /*******************************************************************************
  * Platform memory map regions
@@ -34,8 +34,8 @@
                                        AML_SEC_DEVICE1_SIZE,           \
                                        MT_DEVICE | MT_RW | MT_SECURE)
 
-#define MAP_TZRAM      MAP_REGION_FLAT(AML_TZRAM_BASE,         \
-                                       AML_TZRAM_SIZE,         \
+#define MAP_TZRAM      MAP_REGION_FLAT(AML_TZRAM_BASE,                 \
+                                       AML_TZRAM_SIZE,                 \
                                        MT_DEVICE | MT_RW | MT_SECURE)
 
 #define MAP_SEC_DEVICE2        MAP_REGION_FLAT(AML_SEC_DEVICE2_BASE,           \

diff --git a/plat/amlogic/gxl/gxl_pm.c b/plat/amlogic/gxl/gxl_pm.c
index a3ec7d9bd87f93b89c7b66322de56da8194e25cc..433140b776a9f258603f59d470bdfaa534866d94 100644 (file)
--- a/plat/amlogic/gxl/gxl_pm.c
+++ b/plat/amlogic/gxl/gxl_pm.c
@@ -6,14 +6,14 @@
 
 #include <arch_helpers.h>
 #include <assert.h>
-#include <drivers/console.h>
 #include <common/debug.h>
-#include <errno.h>
 #include <drivers/arm/gicv2.h>
+#include <drivers/console.h>
+#include <errno.h>
 #include <lib/mmio.h>
+#include <lib/psci/psci.h>
 #include <plat/common/platform.h>
 #include <platform_def.h>
-#include <lib/psci/psci.h>
 
 #include "aml_private.h"