diff options
Diffstat (limited to 'plat/socionext')
29 files changed, 131 insertions, 92 deletions
diff --git a/plat/socionext/synquacer/drivers/mhu/sq_mhu.c b/plat/socionext/synquacer/drivers/mhu/sq_mhu.c index 5c2a635b..925ed970 100644 --- a/plat/socionext/synquacer/drivers/mhu/sq_mhu.c +++ b/plat/socionext/synquacer/drivers/mhu/sq_mhu.c @@ -4,11 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bakery_lock.h> -#include <mmio.h> + #include <platform_def.h> + +#include <arch_helpers.h> +#include <lib/bakery_lock.h> +#include <lib/mmio.h> + #include <sq_common.h> #include "sq_mhu.h" diff --git a/plat/socionext/synquacer/drivers/scpi/sq_scpi.c b/plat/socionext/synquacer/drivers/scpi/sq_scpi.c index 170b7e18..0cb75a02 100644 --- a/plat/socionext/synquacer/drivers/scpi/sq_scpi.c +++ b/plat/socionext/synquacer/drivers/scpi/sq_scpi.c @@ -4,12 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> +#include <string.h> + #include <platform_def.h> + +#include <arch_helpers.h> +#include <common/debug.h> #include <sq_common.h> -#include <debug.h> -#include <string.h> + #include "sq_mhu.h" #include "sq_scpi.h" diff --git a/plat/socionext/synquacer/include/platform_def.h b/plat/socionext/synquacer/include/platform_def.h index bde73485..de6be7d2 100644 --- a/plat/socionext/synquacer/include/platform_def.h +++ b/plat/socionext/synquacer/include/platform_def.h @@ -7,8 +7,8 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include <common_def.h> -#include <utils_def.h> +#include <lib/utils_def.h> +#include <plat/common/common_def.h> /* CPU topology */ #define PLAT_MAX_CORES_PER_CLUSTER 2 diff --git a/plat/socionext/synquacer/include/sq_common.h b/plat/socionext/synquacer/include/sq_common.h index c3956403..abd90904 100644 --- a/plat/socionext/synquacer/include/sq_common.h +++ b/plat/socionext/synquacer/include/sq_common.h @@ -8,7 +8,8 @@ #define SQ_COMMON_H #include <stdint.h> -#include <xlat_tables_v2.h> + +#include <lib/xlat_tables/xlat_tables_v2.h> struct draminfo { uint32_t num_regions; diff --git a/plat/socionext/synquacer/sq_bl31_setup.c b/plat/socionext/synquacer/sq_bl31_setup.c index 07c1f899..f8d25262 100644 --- a/plat/socionext/synquacer/sq_bl31_setup.c +++ b/plat/socionext/synquacer/sq_bl31_setup.c @@ -4,14 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <assert.h> + +#include <platform_def.h> + #include <arch.h> #include <arch_helpers.h> -#include <platform_def.h> -#include <assert.h> -#include <bl_common.h> -#include <pl011.h> -#include <debug.h> -#include <mmio.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <drivers/arm/pl011.h> +#include <lib/mmio.h> + #include <sq_common.h> static console_pl011_t console; diff --git a/plat/socionext/synquacer/sq_ccn.c b/plat/socionext/synquacer/sq_ccn.c index bb70d5d8..fa6ea87b 100644 --- a/plat/socionext/synquacer/sq_ccn.c +++ b/plat/socionext/synquacer/sq_ccn.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <platform_def.h> + #include <arch.h> #include <arch_helpers.h> -#include <ccn.h> -#include <platform_def.h> +#include <drivers/arm/ccn.h> static const unsigned char master_to_rn_id_map[] = { PLAT_SQ_CLUSTER_TO_CCN_ID_MAP diff --git a/plat/socionext/synquacer/sq_gicv3.c b/plat/socionext/synquacer/sq_gicv3.c index 94e5a66b..05318e37 100644 --- a/plat/socionext/synquacer/sq_gicv3.c +++ b/plat/socionext/synquacer/sq_gicv3.c @@ -5,11 +5,13 @@ */ #include <assert.h> -#include <gicv3.h> -#include <interrupt_props.h> -#include <platform.h> + #include <platform_def.h> +#include <common/interrupt_props.h> +#include <drivers/arm/gicv3.h> +#include <plat/common/platform.h> + #include "sq_common.h" static uintptr_t sq_rdistif_base_addrs[PLATFORM_CORE_COUNT]; diff --git a/plat/socionext/synquacer/sq_psci.c b/plat/socionext/synquacer/sq_psci.c index c327f1d4..134224dc 100644 --- a/plat/socionext/synquacer/sq_psci.c +++ b/plat/socionext/synquacer/sq_psci.c @@ -4,17 +4,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <cassert.h> -#include <debug.h> -#include <delay_timer.h> #include <errno.h> -#include <generic_delay_timer.h> + #include <platform_def.h> + +#include <arch_helpers.h> +#include <common/debug.h> +#include <drivers/delay_timer.h> +#include <drivers/generic_delay_timer.h> +#include <lib/cassert.h> +#include <lib/psci/psci.h> + #include <sq_common.h> #include "sq_scpi.h" -#include <psci.h> /* Macros to read the SQ power domain state */ #define SQ_PWR_LVL0 MPIDR_AFFLVL0 diff --git a/plat/socionext/synquacer/sq_topology.c b/plat/socionext/synquacer/sq_topology.c index aa203559..359997aa 100644 --- a/plat/socionext/synquacer/sq_topology.c +++ b/plat/socionext/synquacer/sq_topology.c @@ -4,9 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <platform_def.h> + #include <arch.h> + #include <sq_common.h> -#include <platform_def.h> unsigned char sq_pd_tree_desc[PLAT_CLUSTER_COUNT + 1]; diff --git a/plat/socionext/synquacer/sq_xlat_setup.c b/plat/socionext/synquacer/sq_xlat_setup.c index ae147003..5d1669d0 100644 --- a/plat/socionext/synquacer/sq_xlat_setup.c +++ b/plat/socionext/synquacer/sq_xlat_setup.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <debug.h> #include <platform_def.h> -#include <xlat_tables_v2.h> + +#include <common/debug.h> +#include <lib/xlat_tables/xlat_tables_v2.h> #define SQ_REG_REGION_BASE 0x20000000ULL #define SQ_REG_REGION_SIZE 0x60000000ULL diff --git a/plat/socionext/uniphier/include/platform_def.h b/plat/socionext/uniphier/include/platform_def.h index 6e9b98ed..d4db3f5b 100644 --- a/plat/socionext/uniphier/include/platform_def.h +++ b/plat/socionext/uniphier/include/platform_def.h @@ -7,9 +7,9 @@ #ifndef PLATFORM_DEF_H #define PLATFORM_DEF_H -#include <common_def.h> -#include <tbbr/tbbr_img_def.h> -#include <utils_def.h> +#include <common/tbbr/tbbr_img_def.h> +#include <lib/utils_def.h> +#include <plat/common/common_def.h> #define PLATFORM_STACK_SIZE 0x1000 diff --git a/plat/socionext/uniphier/tsp/uniphier_tsp_setup.c b/plat/socionext/uniphier/tsp/uniphier_tsp_setup.c index 7df17d3c..e7dcc652 100644 --- a/plat/socionext/uniphier/tsp/uniphier_tsp_setup.c +++ b/plat/socionext/uniphier/tsp/uniphier_tsp_setup.c @@ -5,7 +5,8 @@ */ #include <platform_def.h> -#include <xlat_mmu_helpers.h> + +#include <lib/xlat_tables/xlat_mmu_helpers.h> #include "../uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_bl2_setup.c b/plat/socionext/uniphier/uniphier_bl2_setup.c index fb7997c8..7109d21f 100644 --- a/plat/socionext/uniphier/uniphier_bl2_setup.c +++ b/plat/socionext/uniphier/uniphier_bl2_setup.c @@ -4,18 +4,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <bl_common.h> -#include <debug.h> -#include <desc_image_load.h> #include <errno.h> -#include <io/io_storage.h> -#include <image_decompress.h> -#include <platform.h> + #include <platform_def.h> + +#include <common/bl_common.h> +#include <common/debug.h> +#include <common/desc_image_load.h> +#include <common/image_decompress.h> +#include <drivers/io/io_storage.h> +#include <lib/xlat_tables/xlat_tables_v2.h> +#include <plat/common/platform.h> #ifdef UNIPHIER_DECOMPRESS_GZIP #include <tf_gunzip.h> #endif -#include <xlat_tables_v2.h> #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_bl31_setup.c b/plat/socionext/uniphier/uniphier_bl31_setup.c index c5acdbd7..ce32d89c 100644 --- a/plat/socionext/uniphier/uniphier_bl31_setup.c +++ b/plat/socionext/uniphier/uniphier_bl31_setup.c @@ -4,16 +4,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch.h> #include <assert.h> -#include <bl_common.h> -#include <console.h> -#include <debug.h> #include <errno.h> -#include <mmio.h> -#include <platform.h> + #include <platform_def.h> -#include <xlat_mmu_helpers.h> + +#include <arch.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <drivers/console.h> +#include <lib/mmio.h> +#include <lib/xlat_tables/xlat_mmu_helpers.h> +#include <plat/common/platform.h> #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_boot_device.c b/plat/socionext/uniphier/uniphier_boot_device.c index 78ca8ef0..462c0859 100644 --- a/plat/socionext/uniphier/uniphier_boot_device.c +++ b/plat/socionext/uniphier/uniphier_boot_device.c @@ -5,10 +5,11 @@ */ #include <assert.h> -#include <mmio.h> #include <stdbool.h> #include <stddef.h> -#include <utils_def.h> + +#include <lib/mmio.h> +#include <lib/utils_def.h> #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_cci.c b/plat/socionext/uniphier/uniphier_cci.c index 9e00c56e..3ca17689 100644 --- a/plat/socionext/uniphier/uniphier_cci.c +++ b/plat/socionext/uniphier/uniphier_cci.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> -#include <cci.h> #include <stddef.h> -#include <utils_def.h> + +#include <arch_helpers.h> +#include <drivers/arm/cci.h> +#include <lib/utils_def.h> #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_emmc.c b/plat/socionext/uniphier/uniphier_emmc.c index db87637b..4ac1f510 100644 --- a/plat/socionext/uniphier/uniphier_emmc.c +++ b/plat/socionext/uniphier/uniphier_emmc.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <io/io_block.h> -#include <mmio.h> -#include <platform_def.h> #include <stdint.h> -#include <utils_def.h> + +#include <platform_def.h> + +#include <arch_helpers.h> +#include <drivers/io/io_block.h> +#include <lib/mmio.h> +#include <lib/utils_def.h> #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_gicv3.c b/plat/socionext/uniphier/uniphier_gicv3.c index 93bc73ac..5148e8f9 100644 --- a/plat/socionext/uniphier/uniphier_gicv3.c +++ b/plat/socionext/uniphier/uniphier_gicv3.c @@ -5,11 +5,13 @@ */ #include <assert.h> -#include <gicv3.h> -#include <interrupt_props.h> -#include <platform.h> + #include <platform_def.h> +#include <drivers/arm/gicv3.h> +#include <common/interrupt_props.h> +#include <plat/common/platform.h> + #include "uniphier.h" static uintptr_t uniphier_rdistif_base_addrs[PLATFORM_CORE_COUNT]; diff --git a/plat/socionext/uniphier/uniphier_image_desc.c b/plat/socionext/uniphier/uniphier_image_desc.c index f4651db0..9e171e07 100644 --- a/plat/socionext/uniphier/uniphier_image_desc.c +++ b/plat/socionext/uniphier/uniphier_image_desc.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch.h> #include <assert.h> -#include <desc_image_load.h> + #include <platform_def.h> +#include <arch.h> +#include <common/desc_image_load.h> + #include "uniphier.h" static struct bl_mem_params_node uniphier_image_descs[] = { diff --git a/plat/socionext/uniphier/uniphier_io_storage.c b/plat/socionext/uniphier/uniphier_io_storage.c index 5d841ac0..451e84f9 100644 --- a/plat/socionext/uniphier/uniphier_io_storage.c +++ b/plat/socionext/uniphier/uniphier_io_storage.c @@ -6,15 +6,17 @@ #include <assert.h> #include <errno.h> -#include <firmware_image_package.h> -#include <io/io_block.h> -#include <io/io_driver.h> -#include <io/io_fip.h> -#include <io/io_memmap.h> -#include <platform_def.h> #include <stdint.h> -#include <utils_def.h> -#include <xlat_tables_v2.h> + +#include <platform_def.h> + +#include <drivers/io/io_block.h> +#include <drivers/io/io_driver.h> +#include <drivers/io/io_fip.h> +#include <drivers/io/io_memmap.h> +#include <lib/utils_def.h> +#include <lib/xlat_tables/xlat_tables_v2.h> +#include <tools_share/firmware_image_package.h> #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_nand.c b/plat/socionext/uniphier/uniphier_nand.c index c8e825d6..271aa0f4 100644 --- a/plat/socionext/uniphier/uniphier_nand.c +++ b/plat/socionext/uniphier/uniphier_nand.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> -#include <debug.h> -#include <io/io_block.h> -#include <mmio.h> -#include <platform_def.h> #include <stdint.h> -#include <utils_def.h> + +#include <platform_def.h> + +#include <arch_helpers.h> +#include <common/debug.h> +#include <drivers/io/io_block.h> +#include <lib/mmio.h> +#include <lib/utils_def.h> #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_psci.c b/plat/socionext/uniphier/uniphier_psci.c index 82081a05..ce11aa7c 100644 --- a/plat/socionext/uniphier/uniphier_psci.c +++ b/plat/socionext/uniphier/uniphier_psci.c @@ -5,9 +5,9 @@ */ #include <arch_helpers.h> -#include <debug.h> -#include <mmio.h> -#include <psci.h> +#include <common/debug.h> +#include <lib/mmio.h> +#include <lib/psci/psci.h> #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_scp.c b/plat/socionext/uniphier/uniphier_scp.c index 58eb72ef..c608a255 100644 --- a/plat/socionext/uniphier/uniphier_scp.c +++ b/plat/socionext/uniphier/uniphier_scp.c @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <mmio.h> -#include <utils_def.h> +#include <lib/mmio.h> +#include <lib/utils_def.h> #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_soc_info.c b/plat/socionext/uniphier/uniphier_soc_info.c index 55688f31..377532de 100644 --- a/plat/socionext/uniphier/uniphier_soc_info.c +++ b/plat/socionext/uniphier/uniphier_soc_info.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <mmio.h> +#include <lib/mmio.h> #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_syscnt.c b/plat/socionext/uniphier/uniphier_syscnt.c index d7bcaf86..19378430 100644 --- a/plat/socionext/uniphier/uniphier_syscnt.c +++ b/plat/socionext/uniphier/uniphier_syscnt.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <platform.h> +#include <plat/common/platform.h> unsigned int plat_get_syscnt_freq2(void) { diff --git a/plat/socionext/uniphier/uniphier_tbbr.c b/plat/socionext/uniphier/uniphier_tbbr.c index 1c834111..962a8d28 100644 --- a/plat/socionext/uniphier/uniphier_tbbr.c +++ b/plat/socionext/uniphier/uniphier_tbbr.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <platform.h> +#include <plat/common/platform.h> extern char uniphier_rotpk_hash[], uniphier_rotpk_hash_end[]; diff --git a/plat/socionext/uniphier/uniphier_topology.c b/plat/socionext/uniphier/uniphier_topology.c index 1f96f585..c106c98b 100644 --- a/plat/socionext/uniphier/uniphier_topology.c +++ b/plat/socionext/uniphier/uniphier_topology.c @@ -5,7 +5,7 @@ */ #include <arch.h> -#include <platform.h> +#include <plat/common/platform.h> #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_usb.c b/plat/socionext/uniphier/uniphier_usb.c index b51b6012..ef7079a5 100644 --- a/plat/socionext/uniphier/uniphier_usb.c +++ b/plat/socionext/uniphier/uniphier_usb.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <io/io_block.h> -#include <mmio.h> -#include <platform_def.h> #include <stdint.h> -#include <utils_def.h> + +#include <platform_def.h> + +#include <arch_helpers.h> +#include <drivers/io/io_block.h> +#include <lib/mmio.h> +#include <lib/utils_def.h> #include "uniphier.h" diff --git a/plat/socionext/uniphier/uniphier_xlat_setup.c b/plat/socionext/uniphier/uniphier_xlat_setup.c index 3112ecd9..0faebc99 100644 --- a/plat/socionext/uniphier/uniphier_xlat_setup.c +++ b/plat/socionext/uniphier/uniphier_xlat_setup.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <debug.h> #include <platform_def.h> -#include <xlat_tables_v2.h> + +#include <common/debug.h> +#include <lib/xlat_tables/xlat_tables_v2.h> #define UNIPHIER_REG_REGION_BASE 0x50000000ULL #define UNIPHIER_REG_REGION_SIZE 0x20000000ULL |