diff options
author | Carlo Caione <ccaione@baylibre.com> | 2019-09-03 12:38:58 +0100 |
---|---|---|
committer | Carlo Caione <ccaione@baylibre.com> | 2019-09-11 18:05:26 +0100 |
commit | b56218744e318097b2d850510505d0bcac6d5132 (patch) | |
tree | 0e8731857ada0b2dba9ac369619d1c2da7fcb432 /plat/amlogic | |
parent | 421b67b66697374f504ec2eb3d9f954437e02f2e (diff) |
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
Diffstat (limited to 'plat/amlogic')
-rw-r--r-- | plat/amlogic/gxbb/gxbb_bl31_setup.c | 4 | ||||
-rw-r--r-- | plat/amlogic/gxbb/gxbb_common.c | 10 | ||||
-rw-r--r-- | plat/amlogic/gxbb/gxbb_pm.c | 8 | ||||
-rw-r--r-- | plat/amlogic/gxl/gxl_bl31_setup.c | 6 | ||||
-rw-r--r-- | plat/amlogic/gxl/gxl_common.c | 10 | ||||
-rw-r--r-- | plat/amlogic/gxl/gxl_pm.c | 6 |
6 files changed, 19 insertions, 25 deletions
diff --git a/plat/amlogic/gxbb/gxbb_bl31_setup.c b/plat/amlogic/gxbb/gxbb_bl31_setup.c index 6d6b2ad7..cc7a1c49 100644 --- 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 831bc66e..e98748e7 100644 --- 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 ed57fee4..48bff7ba 100644 --- 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 9c49646a..f581dd13 100644 --- 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 63148884..46868853 100644 --- 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 a3ec7d9b..433140b7 100644 --- 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" |