diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-07-20 22:01:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-20 22:01:00 +0100 |
| commit | aa965e1583349b36ce7edd2b3fe9f1f461ef8b23 (patch) | |
| tree | b6370d9de2f68a3b3bb2882598f77785cf0af868 /plat/hisilicon | |
| parent | 4deb7bcc4fe436a0e11c13b8404d49eaaa79f305 (diff) | |
| parent | ee1ebbd18e2a1e3b8a5b9ac9fba155177e2af4a1 (diff) | |
Merge pull request #1029 from islmit01/im/fix_includes
Fix order of includes
Diffstat (limited to 'plat/hisilicon')
| -rw-r--r-- | plat/hisilicon/hikey/hisi_pwrc.c | 6 | ||||
| -rw-r--r-- | plat/hisilicon/hikey/hisi_sip_svc.c | 2 | ||||
| -rw-r--r-- | plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c | 4 | ||||
| -rw-r--r-- | plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c | 6 | ||||
| -rw-r--r-- | plat/hisilicon/hikey960/hikey960_bl1_setup.c | 2 | ||||
| -rw-r--r-- | plat/hisilicon/hikey960/include/plat_macros.S | 2 |
6 files changed, 13 insertions, 9 deletions
diff --git a/plat/hisilicon/hikey/hisi_pwrc.c b/plat/hisilicon/hikey/hisi_pwrc.c index fcc9bd89..ade408d4 100644 --- a/plat/hisilicon/hikey/hisi_pwrc.c +++ b/plat/hisilicon/hikey/hisi_pwrc.c @@ -6,11 +6,13 @@ #include <debug.h> #include <mmio.h> + +#include <hi6220_regs_acpu.h> +#include <hi6220_regs_ao.h> #include <hisi_ipc.h> #include <hisi_pwrc.h> #include <hisi_sram_map.h> -#include <hi6220_regs_acpu.h> -#include <hi6220_regs_ao.h> + #include <stdarg.h> #include <stdio.h> #include <string.h> diff --git a/plat/hisilicon/hikey/hisi_sip_svc.c b/plat/hisilicon/hikey/hisi_sip_svc.c index 15953af0..b3109d61 100644 --- a/plat/hisilicon/hikey/hisi_sip_svc.c +++ b/plat/hisilicon/hikey/hisi_sip_svc.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <hisi_sip_svc.h> #include <debug.h> +#include <hisi_sip_svc.h> #include <pmf.h> #include <runtime_svc.h> #include <stdint.h> diff --git a/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c b/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c index 8ce1e4ff..4c664d11 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 f82144a4..9fdc3e74 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 f9666df1..54e73478 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 9f1befdc..5137f9eb 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" |