diff options
Diffstat (limited to 'plat/marvell/a3700')
-rw-r--r-- | plat/marvell/a3700/a3700/board/pm_src.c | 1 | ||||
-rw-r--r-- | plat/marvell/a3700/a3700/plat_bl31_setup.c | 3 | ||||
-rw-r--r-- | plat/marvell/a3700/common/a3700_common.mk | 4 | ||||
-rw-r--r-- | plat/marvell/a3700/common/a3700_sip_svc.c | 8 | ||||
-rw-r--r-- | plat/marvell/a3700/common/dram_win.c | 6 | ||||
-rw-r--r-- | plat/marvell/a3700/common/include/dram_win.h | 3 | ||||
-rw-r--r-- | plat/marvell/a3700/common/include/platform_def.h | 5 | ||||
-rw-r--r-- | plat/marvell/a3700/common/io_addr_dec.c | 6 | ||||
-rw-r--r-- | plat/marvell/a3700/common/marvell_plat_config.c | 3 | ||||
-rw-r--r-- | plat/marvell/a3700/common/plat_pm.c | 15 |
10 files changed, 32 insertions, 22 deletions
diff --git a/plat/marvell/a3700/a3700/board/pm_src.c b/plat/marvell/a3700/a3700/board/pm_src.c index bc48ce8ca3..d6eca5d167 100644 --- a/plat/marvell/a3700/a3700/board/pm_src.c +++ b/plat/marvell/a3700/a3700/board/pm_src.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ + #include <a3700_pm.h> #include <plat_marvell.h> diff --git a/plat/marvell/a3700/a3700/plat_bl31_setup.c b/plat/marvell/a3700/a3700/plat_bl31_setup.c index 83db06f9d0..6862a86706 100644 --- a/plat/marvell/a3700/a3700/plat_bl31_setup.c +++ b/plat/marvell/a3700/a3700/plat_bl31_setup.c @@ -5,10 +5,11 @@ * https://spdx.org/licenses */ +#include <lib/mmio.h> + #include <armada_common.h> #include <dram_win.h> #include <io_addr_dec.h> -#include <mmio.h> #include <marvell_plat_priv.h> #include <plat_marvell.h> diff --git a/plat/marvell/a3700/common/a3700_common.mk b/plat/marvell/a3700/common/a3700_common.mk index e2ac97ffc9..a4727d2ea7 100644 --- a/plat/marvell/a3700/common/a3700_common.mk +++ b/plat/marvell/a3700/common/a3700_common.mk @@ -84,14 +84,12 @@ MARVELL_GIC_SOURCES := drivers/arm/gic/common/gic_common.c \ plat/common/plat_gicv3.c \ drivers/arm/gic/v3/gic500.c -ATF_INCLUDES := -Iinclude/common/tbbr \ - -Iinclude/drivers +ATF_INCLUDES := -Iinclude/common/tbbr PLAT_INCLUDES := -I$(PLAT_FAMILY_BASE)/$(PLAT) \ -I$(PLAT_COMMON_BASE)/include \ -I$(PLAT_INCLUDE_BASE)/common \ -I$(MARVELL_DRV_BASE) \ - -Iinclude/drivers/marvell/uart \ -I$/drivers/arm/gic/common/ \ $(ATF_INCLUDES) diff --git a/plat/marvell/a3700/common/a3700_sip_svc.c b/plat/marvell/a3700/common/a3700_sip_svc.c index 88d1fc2f7e..e8ac5fc08d 100644 --- a/plat/marvell/a3700/common/a3700_sip_svc.c +++ b/plat/marvell/a3700/common/a3700_sip_svc.c @@ -5,11 +5,13 @@ * https://spdx.org/licenses */ -#include <debug.h> +#include <common/debug.h> +#include <common/runtime_svc.h> +#include <lib/smccc.h> + #include <marvell_plat_priv.h> #include <plat_marvell.h> -#include <runtime_svc.h> -#include <smccc.h> + #include "comphy/phy-comphy-3700.h" /* Comphy related FID's */ diff --git a/plat/marvell/a3700/common/dram_win.c b/plat/marvell/a3700/common/dram_win.c index fb236d82d6..694f6d480e 100644 --- a/plat/marvell/a3700/common/dram_win.c +++ b/plat/marvell/a3700/common/dram_win.c @@ -5,12 +5,14 @@ * https://spdx.org/licenses */ +#include <string.h> + +#include <lib/mmio.h> + #include <dram_win.h> #include <marvell_plat_priv.h> -#include <mmio.h> #include <mvebu.h> #include <plat_marvell.h> -#include <string.h> /* Armada 3700 has 5 configurable windows */ #define MV_CPU_WIN_NUM 5 diff --git a/plat/marvell/a3700/common/include/dram_win.h b/plat/marvell/a3700/common/include/dram_win.h index 6f345f9453..26a013784a 100644 --- a/plat/marvell/a3700/common/include/dram_win.h +++ b/plat/marvell/a3700/common/include/dram_win.h @@ -8,7 +8,8 @@ #ifndef DRAM_WIN_H #define DRAM_WIN_H -#include <bl_common.h> +#include <common/bl_common.h> + #include <io_addr_dec.h> void dram_win_map_build(struct dram_win_map *win_map); diff --git a/plat/marvell/a3700/common/include/platform_def.h b/plat/marvell/a3700/common/include/platform_def.h index ca2553c99d..16865c4d23 100644 --- a/plat/marvell/a3700/common/include/platform_def.h +++ b/plat/marvell/a3700/common/include/platform_def.h @@ -8,12 +8,13 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include <board_marvell_def.h> -#include <mvebu_def.h> #ifndef __ASSEMBLY__ #include <stdio.h> #endif /* __ASSEMBLY__ */ +#include <board_marvell_def.h> +#include <mvebu_def.h> + /* * Most platform porting definitions provided by included headers */ diff --git a/plat/marvell/a3700/common/io_addr_dec.c b/plat/marvell/a3700/common/io_addr_dec.c index f00959433a..b27633cf25 100644 --- a/plat/marvell/a3700/common/io_addr_dec.c +++ b/plat/marvell/a3700/common/io_addr_dec.c @@ -4,9 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause * https://spdx.org/licenses */ -#include <debug.h> + +#include <common/debug.h> +#include <lib/mmio.h> + #include <io_addr_dec.h> -#include <mmio.h> #include <plat_marvell.h> #define MVEBU_DEC_WIN_CTRL_REG(base, win, off) (MVEBU_REGS_BASE + (base) + \ diff --git a/plat/marvell/a3700/common/marvell_plat_config.c b/plat/marvell/a3700/common/marvell_plat_config.c index 85a420130f..3bf3d96bdb 100644 --- a/plat/marvell/a3700/common/marvell_plat_config.c +++ b/plat/marvell/a3700/common/marvell_plat_config.c @@ -5,7 +5,8 @@ * https://spdx.org/licenses */ -#include <bl_common.h> +#include <common/bl_common.h> + #include <io_addr_dec.h> #include <mvebu_def.h> diff --git a/plat/marvell/a3700/common/plat_pm.c b/plat/marvell/a3700/common/plat_pm.c index dce484168d..f8ce6fe29e 100644 --- a/plat/marvell/a3700/common/plat_pm.c +++ b/plat/marvell/a3700/common/plat_pm.c @@ -5,22 +5,23 @@ * https://spdx.org/licenses */ +#include <common/debug.h> +#ifdef USE_CCI +#include <drivers/arm/cci.h> +#endif +#include <lib/psci/psci.h> +#include <lib/mmio.h> +#include <plat/common/platform.h> + #include <a3700_pm.h> #include <arch_helpers.h> #include <armada_common.h> -#include <debug.h> #include <dram_win.h> #include <io_addr_dec.h> -#include <mmio.h> #include <mvebu.h> #include <mvebu_def.h> #include <marvell_plat_priv.h> -#include <platform.h> #include <plat_marvell.h> -#include <psci.h> -#ifdef USE_CCI -#include <cci.h> -#endif /* Warm reset register */ #define MVEBU_WARM_RESET_REG (MVEBU_NB_REGS_BASE + 0x840) |