diff options
Diffstat (limited to 'plat/hisilicon')
56 files changed, 394 insertions, 323 deletions
diff --git a/plat/hisilicon/hikey/aarch64/hikey_common.c b/plat/hisilicon/hikey/aarch64/hikey_common.c index 60e4d867..702fc2d8 100644 --- a/plat/hisilicon/hikey/aarch64/hikey_common.c +++ b/plat/hisilicon/hikey/aarch64/hikey_common.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <debug.h> + +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <lib/mmio.h> +#include <lib/xlat_tables/xlat_tables.h> +#include <plat/common/platform.h> + #include <hikey_def.h> #include <hikey_layout.h> -#include <mmio.h> -#include <platform.h> -#include <xlat_tables.h> #define MAP_DDR MAP_REGION_FLAT(DDR_BASE, \ DDR_SIZE - DDR_SEC_SIZE, \ diff --git a/plat/hisilicon/hikey/hikey_bl1_setup.c b/plat/hisilicon/hikey/hikey_bl1_setup.c index 6fcb5973..a08bdfa7 100644 --- a/plat/hisilicon/hikey/hikey_bl1_setup.c +++ b/plat/hisilicon/hikey/hikey_bl1_setup.c @@ -4,23 +4,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <debug.h> -#include <dw_mmc.h> #include <errno.h> +#include <string.h> + +#include <arch_helpers.h> +#include <bl1/tbbr/tbbr_img_desc.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <drivers/arm/pl011.h> +#include <drivers/mmc.h> +#include <drivers/synopsys/dw_mmc.h> +#include <lib/mmio.h> +#include <plat/common/platform.h> + #include <hi6220.h> #include <hikey_def.h> #include <hikey_layout.h> -#include <mmc.h> -#include <mmio.h> -#include <pl011.h> -#include <platform.h> -#include <string.h> -#include <tbbr/tbbr_img_desc.h> -#include "../../bl1/bl1_private.h" +#include "../../../bl1/bl1_private.h" #include "hikey_private.h" /* Data structure which holds the extents of the trusted RAM for BL1 */ diff --git a/plat/hisilicon/hikey/hikey_bl2_mem_params_desc.c b/plat/hisilicon/hikey/hikey_bl2_mem_params_desc.c index 23c16ed9..4e013a0f 100644 --- a/plat/hisilicon/hikey/hikey_bl2_mem_params_desc.c +++ b/plat/hisilicon/hikey/hikey_bl2_mem_params_desc.c @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <bl_common.h> -#include <desc_image_load.h> -#include <platform.h> #include <platform_def.h> /* also includes hikey_def.h and hikey_layout.h*/ +#include <common/bl_common.h> +#include <common/desc_image_load.h> +#include <plat/common/platform.h> /******************************************************************************* * Following descriptor provides BL image/ep information that gets used diff --git a/plat/hisilicon/hikey/hikey_bl2_setup.c b/plat/hisilicon/hikey/hikey_bl2_setup.c index 125d6654..b8723737 100644 --- a/plat/hisilicon/hikey/hikey_bl2_setup.c +++ b/plat/hisilicon/hikey/hikey_bl2_setup.c @@ -4,27 +4,29 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <debug.h> -#include <delay_timer.h> -#include <desc_image_load.h> -#include <dw_mmc.h> #include <errno.h> -#include <hi6220.h> -#include <hisi_mcu.h> -#include <hisi_sram_map.h> -#include <mmc.h> -#include <mmio.h> +#include <string.h> + +#include <platform_def.h> /* also includes hikey_def.h and hikey_layout.h*/ + +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <common/desc_image_load.h> +#include <drivers/arm/pl011.h> +#include <drivers/delay_timer.h> +#include <drivers/mmc.h> +#include <drivers/synopsys/dw_mmc.h> +#include <lib/mmio.h> #ifdef SPD_opteed -#include <optee_utils.h> +#include <lib/optee_utils.h> #endif -#include <pl011.h> -#include <platform.h> -#include <platform_def.h> /* also includes hikey_def.h and hikey_layout.h*/ -#include <string.h> +#include <plat/common/platform.h> +#include <hi6220.h> +#include <hisi_mcu.h> +#include <hisi_sram_map.h> #include "hikey_private.h" /* diff --git a/plat/hisilicon/hikey/hikey_bl31_setup.c b/plat/hisilicon/hikey/hikey_bl31_setup.c index 0e061e92..b2dcb619 100644 --- a/plat/hisilicon/hikey/hikey_bl31_setup.c +++ b/plat/hisilicon/hikey/hikey_bl31_setup.c @@ -4,21 +4,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <cci.h> -#include <debug.h> #include <errno.h> -#include <gicv2.h> + +#include <platform_def.h> + +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <common/interrupt_props.h> +#include <drivers/arm/cci.h> +#include <drivers/arm/gicv2.h> +#include <drivers/arm/pl011.h> +#include <lib/mmio.h> + #include <hi6220.h> #include <hikey_def.h> #include <hisi_ipc.h> #include <hisi_pwrc.h> -#include <interrupt_props.h> -#include <mmio.h> -#include <pl011.h> -#include <platform_def.h> #include "hikey_private.h" diff --git a/plat/hisilicon/hikey/hikey_bl_common.c b/plat/hisilicon/hikey/hikey_bl_common.c index b254a900..d062de45 100644 --- a/plat/hisilicon/hikey/hikey_bl_common.c +++ b/plat/hisilicon/hikey/hikey_bl_common.c @@ -5,13 +5,13 @@ */ #include <arch_helpers.h> -#include <gpio.h> +#include <drivers/arm/pl061_gpio.h> +#include <drivers/arm/sp804_delay_timer.h> +#include <drivers/gpio.h> +#include <lib/mmio.h> + #include <hi6220.h> #include <hi6553.h> -#include <mmio.h> -#include <pl061_gpio.h> -#include <sp804_delay_timer.h> - #include "hikey_private.h" void hikey_sp804_init(void) diff --git a/plat/hisilicon/hikey/hikey_ddr.c b/plat/hisilicon/hikey/hikey_ddr.c index 43cece00..e688c157 100644 --- a/plat/hisilicon/hikey/hikey_ddr.c +++ b/plat/hisilicon/hikey/hikey_ddr.c @@ -4,16 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <debug.h> #include <errno.h> + +#include <arch_helpers.h> +#include <common/debug.h> +#include <drivers/arm/sp804_delay_timer.h> +#include <lib/mmio.h> + #include <hi6220.h> #include <hi6553.h> #include <hisi_sram_map.h> -#include <mmio.h> -#include <sp804_delay_timer.h> - #include "hikey_private.h" static void init_pll(void) diff --git a/plat/hisilicon/hikey/hikey_image_load.c b/plat/hisilicon/hikey/hikey_image_load.c index 32ca36db..0ab1ca49 100644 --- a/plat/hisilicon/hikey/hikey_image_load.c +++ b/plat/hisilicon/hikey/hikey_image_load.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <bl_common.h> -#include <desc_image_load.h> -#include <platform.h> +#include <common/bl_common.h> +#include <common/desc_image_load.h> +#include <plat/common/platform.h> /******************************************************************************* * This function flushes the data structures so that they are visible diff --git a/plat/hisilicon/hikey/hikey_io_storage.c b/plat/hisilicon/hikey/hikey_io_storage.c index 3efbefe8..11dd9733 100644 --- a/plat/hisilicon/hikey/hikey_io_storage.c +++ b/plat/hisilicon/hikey/hikey_io_storage.c @@ -4,21 +4,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <debug.h> #include <errno.h> -#include <firmware_image_package.h> -#include <io_block.h> -#include <io_driver.h> -#include <io_fip.h> -#include <io_memmap.h> -#include <io_storage.h> -#include <mmc.h> -#include <mmio.h> -#include <platform_def.h> -#include <semihosting.h> /* For FOPEN_MODE_... */ #include <string.h> + +#include <platform_def.h> + +#include <arch_helpers.h> +#include <common/debug.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 <drivers/io/io_storage.h> +#include <drivers/mmc.h> +#include <lib/mmio.h> +#include <lib/semihosting.h> +#include <tools_share/firmware_image_package.h> + #include "hikey_private.h" #define EMMC_BLOCK_SHIFT 9 diff --git a/plat/hisilicon/hikey/hikey_pm.c b/plat/hisilicon/hikey/hikey_pm.c index 3128a3d1..05c1e7f2 100644 --- a/plat/hisilicon/hikey/hikey_pm.c +++ b/plat/hisilicon/hikey/hikey_pm.c @@ -4,19 +4,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <cci.h> -#include <debug.h> -#include <gicv2.h> + +#include <arch_helpers.h> +#include <common/debug.h> +#include <drivers/arm/cci.h> +#include <drivers/arm/gicv2.h> +#include <drivers/arm/sp804_delay_timer.h> +#include <lib/mmio.h> +#include <lib/psci/psci.h> + #include <hi6220.h> #include <hikey_def.h> #include <hisi_ipc.h> #include <hisi_pwrc.h> #include <hisi_sram_map.h> -#include <mmio.h> -#include <psci.h> -#include <sp804_delay_timer.h> #define CORE_PWR_STATE(state) \ ((state)->pwr_domain_state[MPIDR_AFFLVL0]) diff --git a/plat/hisilicon/hikey/hikey_private.h b/plat/hisilicon/hikey/hikey_private.h index ca1baa3f..d82a0794 100644 --- a/plat/hisilicon/hikey/hikey_private.h +++ b/plat/hisilicon/hikey/hikey_private.h @@ -7,7 +7,7 @@ #ifndef HIKEY_PRIVATE_H #define HIKEY_PRIVATE_H -#include <bl_common.h> +#include <common/bl_common.h> #define RANDOM_MAX 0x7fffffffffffffff #define RANDOM_MAGIC 0x9a4dbeaf diff --git a/plat/hisilicon/hikey/hikey_security.c b/plat/hisilicon/hikey/hikey_security.c index 43d7b7ad..4b959394 100644 --- a/plat/hisilicon/hikey/hikey_security.c +++ b/plat/hisilicon/hikey/hikey_security.c @@ -5,11 +5,14 @@ */ #include <assert.h> -#include <debug.h> -#include <platform_def.h> #include <stdint.h> #include <string.h> -#include <utils_def.h> + +#include <platform_def.h> + +#include <common/debug.h> +#include <lib/utils_def.h> + #include "hikey_private.h" #define PORTNUM_MAX 5 diff --git a/plat/hisilicon/hikey/hikey_tbbr.c b/plat/hisilicon/hikey/hikey_tbbr.c index 20eda361..1f05d18e 100644 --- a/plat/hisilicon/hikey/hikey_tbbr.c +++ b/plat/hisilicon/hikey/hikey_tbbr.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <platform.h> +#include <plat/common/platform.h> extern char hikey_rotpk_hash[], hikey_rotpk_hash_end[]; diff --git a/plat/hisilicon/hikey/hikey_topology.c b/plat/hisilicon/hikey/hikey_topology.c index 95948b8d..7890eb7e 100644 --- a/plat/hisilicon/hikey/hikey_topology.c +++ b/plat/hisilicon/hikey/hikey_topology.c @@ -3,9 +3,11 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch.h> + #include <platform_def.h> -#include <psci.h> + +#include <arch.h> +#include <lib/psci/psci.h> /* * The HiKey power domain tree descriptor. The cluster power domains diff --git a/plat/hisilicon/hikey/hisi_dvfs.c b/plat/hisilicon/hikey/hisi_dvfs.c index 0d4f893b..22a67fdc 100644 --- a/plat/hisilicon/hikey/hisi_dvfs.c +++ b/plat/hisilicon/hikey/hisi_dvfs.c @@ -4,18 +4,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <console.h> -#include <debug.h> +#include <string.h> + +#include <platform_def.h> + +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <drivers/console.h> +#include <lib/mmio.h> +#include <plat/common/platform.h> + #include <hi6220.h> #include <hi6553.h> #include <hisi_sram_map.h> -#include <mmio.h> -#include <platform.h> -#include <platform_def.h> -#include <string.h> #define ACPU_FREQ_MAX_NUM 5 #define ACPU_OPP_NUM 7 diff --git a/plat/hisilicon/hikey/hisi_ipc.c b/plat/hisilicon/hikey/hisi_ipc.c index 7e02f3ae..43ee0b2a 100644 --- a/plat/hisilicon/hikey/hisi_ipc.c +++ b/plat/hisilicon/hikey/hisi_ipc.c @@ -4,16 +4,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> -#include <debug.h> -#include <hisi_ipc.h> -#include <hisi_sram_map.h> -#include <mmio.h> -#include <platform_def.h> #include <stdarg.h> #include <stdio.h> #include <string.h> +#include <platform_def.h> + +#include <arch_helpers.h> +#include <common/debug.h> +#include <lib/mmio.h> + +#include <hisi_ipc.h> +#include <hisi_sram_map.h> + static int ipc_init; static unsigned int cpu_ipc_num[PLATFORM_CLUSTER_COUNT][PLATFORM_CORE_COUNT_PER_CLUSTER] = { diff --git a/plat/hisilicon/hikey/hisi_mcu.c b/plat/hisilicon/hikey/hisi_mcu.c index 359b94d7..ac83bd85 100644 --- a/plat/hisilicon/hikey/hisi_mcu.c +++ b/plat/hisilicon/hikey/hisi_mcu.c @@ -4,17 +4,20 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <console.h> -#include <debug.h> -#include <hi6220.h> -#include <mmio.h> -#include <platform.h> -#include <platform_def.h> #include <string.h> +#include <platform_def.h> + +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <drivers/console.h> +#include <lib/mmio.h> +#include <plat/common/platform.h> + +#include <hi6220.h> + #define MCU_SECTION_MAX 30 enum MCU_IMAGE_SEC_TYPE_ENUM { diff --git a/plat/hisilicon/hikey/hisi_pwrc.c b/plat/hisilicon/hikey/hisi_pwrc.c index b635fb16..e2e3db75 100644 --- a/plat/hisilicon/hikey/hisi_pwrc.c +++ b/plat/hisilicon/hikey/hisi_pwrc.c @@ -4,8 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <debug.h> -#include <mmio.h> +#include <stdarg.h> +#include <stdio.h> +#include <string.h> + +#include <platform_def.h> + +#include <common/debug.h> +#include <lib/mmio.h> #include <hi6220_regs_acpu.h> #include <hi6220_regs_ao.h> @@ -13,11 +19,6 @@ #include <hisi_pwrc.h> #include <hisi_sram_map.h> -#include <stdarg.h> -#include <stdio.h> -#include <string.h> -#include <platform_def.h> - #define CLUSTER_CORE_COUNT (4) #define CLUSTER_CORE_MASK ((1 << CLUSTER_CORE_COUNT) - 1) diff --git a/plat/hisilicon/hikey/hisi_sip_svc.c b/plat/hisilicon/hikey/hisi_sip_svc.c index ffa49037..3cd1bd09 100644 --- a/plat/hisilicon/hikey/hisi_sip_svc.c +++ b/plat/hisilicon/hikey/hisi_sip_svc.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <debug.h> -#include <hisi_sip_svc.h> -#include <pmf.h> -#include <runtime_svc.h> #include <stdint.h> -#include <uuid.h> +#include <common/debug.h> +#include <common/runtime_svc.h> +#include <lib/pmf/pmf.h> +#include <tools_share/uuid.h> + +#include <hisi_sip_svc.h> /* Hisi SiP Service UUID */ DEFINE_SVC_UUID2(hisi_sip_svc_uid, diff --git a/plat/hisilicon/hikey/include/hi6553.h b/plat/hisilicon/hikey/include/hi6553.h index 55ce91ca..fc991f84 100644 --- a/plat/hisilicon/hikey/include/hi6553.h +++ b/plat/hisilicon/hikey/include/hi6553.h @@ -7,8 +7,9 @@ #ifndef HI6553_H #define HI6553_H +#include <lib/mmio.h> + #include <hi6220.h> -#include <mmio.h> #define HI6553_DISABLE6_XO_CLK (PMUSSI_BASE + (0x036 << 2)) diff --git a/plat/hisilicon/hikey/include/plat_macros.S b/plat/hisilicon/hikey/include/plat_macros.S index de38bd50..9cd276a3 100644 --- a/plat/hisilicon/hikey/include/plat_macros.S +++ b/plat/hisilicon/hikey/include/plat_macros.S @@ -7,8 +7,8 @@ #ifndef PLAT_MACROS_S #define PLAT_MACROS_S -#include <cci.h> -#include <gicv2.h> +#include <drivers/arm/cci.h> +#include <drivers/arm/gicv2.h> #include <hi6220.h> #include <platform_def.h> diff --git a/plat/hisilicon/hikey/include/platform_def.h b/plat/hisilicon/hikey/include/platform_def.h index 485eb380..2537ac66 100644 --- a/plat/hisilicon/hikey/include/platform_def.h +++ b/plat/hisilicon/hikey/include/platform_def.h @@ -8,11 +8,12 @@ #define PLATFORM_DEF_H #include <arch.h> -#include <common_def.h> +#include <common/tbbr/tbbr_img_def.h> +#include <lib/utils_def.h> +#include <plat/common/common_def.h> + #include <hikey_def.h> #include <hikey_layout.h> /* BL memory region sizes, etc */ -#include <tbbr_img_def.h> -#include <utils_def.h> /* Special value used to verify platform parameters from BL2 to BL3-1 */ #define HIKEY_BL31_PLAT_PARAM_VAL 0x0f1e2d3c4b5a6978ULL diff --git a/plat/hisilicon/hikey/platform.mk b/plat/hisilicon/hikey/platform.mk index 398b224c..6d077f74 100644 --- a/plat/hisilicon/hikey/platform.mk +++ b/plat/hisilicon/hikey/platform.mk @@ -46,7 +46,6 @@ endif USE_COHERENT_MEM := 1 PLAT_INCLUDES := -Iinclude/common/tbbr \ - -Iinclude/drivers/synopsys \ -Iplat/hisilicon/hikey/include PLAT_BL_COMMON_SOURCES := drivers/arm/pl011/aarch64/pl011_console.S \ diff --git a/plat/hisilicon/hikey960/aarch64/hikey960_common.c b/plat/hisilicon/hikey960/aarch64/hikey960_common.c index 1ed3eaa6..612a7f21 100644 --- a/plat/hisilicon/hikey960/aarch64/hikey960_common.c +++ b/plat/hisilicon/hikey960/aarch64/hikey960_common.c @@ -4,14 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <debug.h> -#include <mmio.h> -#include <platform.h> + #include <platform_def.h> -#include <xlat_tables.h> + +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <lib/mmio.h> +#include <lib/xlat_tables/xlat_tables.h> +#include <plat/common/platform.h> #include "../hikey960_def.h" #include "../hikey960_private.h" diff --git a/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c b/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c index 4c664d11..a6a49493 100644 --- a/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c +++ b/plat/hisilicon/hikey960/drivers/ipc/hisi_ipc.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#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 <arch_helpers.h> +#include <common/debug.h> +#include <lib/mmio.h> +#include <plat/common/platform.h> + +#include <hi3660.h> +#include <hisi_ipc.h> #include "../../hikey960_private.h" #define IPC_MBX_SOURCE_REG(m) (IPC_BASE + ((m) << 6)) diff --git a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c b/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c index 45fcd42b..659a1c4a 100644 --- a/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c +++ b/plat/hisilicon/hikey960/drivers/pwrc/hisi_pwrc.c @@ -4,15 +4,16 @@ * 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 <arch_helpers.h> +#include <lib/mmio.h> +#include <plat/common/platform.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 ff2c77a6..38bdbe41 100644 --- a/plat/hisilicon/hikey960/hikey960_bl1_setup.c +++ b/plat/hisilicon/hikey960/hikey960_bl1_setup.c @@ -4,26 +4,28 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <debug.h> -#include <delay_timer.h> -#include <dw_ufs.h> #include <errno.h> -#include <generic_delay_timer.h> -#include <gicv2.h> -#include <hi3660.h> -#include <interrupt_props.h> -#include <mmio.h> -#include <pl011.h> -#include <platform.h> -#include <platform_def.h> #include <string.h> -#include <tbbr/tbbr_img_desc.h> -#include <ufs.h> -#include "../../bl1/bl1_private.h" +#include <platform_def.h> + +#include <arch_helpers.h> +#include <bl1/tbbr/tbbr_img_desc.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <common/interrupt_props.h> +#include <drivers/arm/gicv2.h> +#include <drivers/arm/pl011.h> +#include <drivers/delay_timer.h> +#include <drivers/dw_ufs.h> +#include <drivers/generic_delay_timer.h> +#include <drivers/ufs.h> +#include <lib/mmio.h> +#include <plat/common/platform.h> + +#include <hi3660.h> +#include "../../../bl1/bl1_private.h" #include "hikey960_def.h" #include "hikey960_private.h" diff --git a/plat/hisilicon/hikey960/hikey960_bl2_mem_params_desc.c b/plat/hisilicon/hikey960/hikey960_bl2_mem_params_desc.c index 2944b1f7..ba236d22 100644 --- a/plat/hisilicon/hikey960/hikey960_bl2_mem_params_desc.c +++ b/plat/hisilicon/hikey960/hikey960_bl2_mem_params_desc.c @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <bl_common.h> -#include <desc_image_load.h> -#include <platform.h> #include <platform_def.h> +#include <common/bl_common.h> +#include <common/desc_image_load.h> +#include <plat/common/platform.h> /******************************************************************************* * Following descriptor provides BL image/ep information that gets used diff --git a/plat/hisilicon/hikey960/hikey960_bl2_setup.c b/plat/hisilicon/hikey960/hikey960_bl2_setup.c index 552356f1..788392db 100644 --- a/plat/hisilicon/hikey960/hikey960_bl2_setup.c +++ b/plat/hisilicon/hikey960/hikey960_bl2_setup.c @@ -4,25 +4,27 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <debug.h> -#include <delay_timer.h> -#include <desc_image_load.h> -#include <dw_ufs.h> #include <errno.h> -#include <generic_delay_timer.h> -#include <hi3660.h> -#include <mmio.h> +#include <string.h> + +#include <platform_def.h> + +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <common/desc_image_load.h> +#include <drivers/arm/pl011.h> +#include <drivers/delay_timer.h> +#include <drivers/dw_ufs.h> +#include <drivers/generic_delay_timer.h> +#include <drivers/ufs.h> +#include <lib/mmio.h> #ifdef SPD_opteed -#include <optee_utils.h> +#include <lib/optee_utils.h> #endif -#include <pl011.h> -#include <platform_def.h> -#include <string.h> -#include <ufs.h> +#include <hi3660.h> #include "hikey960_def.h" #include "hikey960_private.h" diff --git a/plat/hisilicon/hikey960/hikey960_bl31_setup.c b/plat/hisilicon/hikey960/hikey960_bl31_setup.c index 22614706..67b06f49 100644 --- a/plat/hisilicon/hikey960/hikey960_bl31_setup.c +++ b/plat/hisilicon/hikey960/hikey960_bl31_setup.c @@ -4,24 +4,26 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <cci.h> -#include <console.h> -#include <debug.h> #include <errno.h> -#include <generic_delay_timer.h> -#include <gicv2.h> -#include <hi3660.h> -#include <mmio.h> -#include <hisi_ipc.h> -#include <interrupt_mgmt.h> -#include <interrupt_props.h> -#include <pl011.h> -#include <platform.h> + #include <platform_def.h> +#include <arch_helpers.h> +#include <bl31/interrupt_mgmt.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <common/interrupt_props.h> +#include <drivers/arm/cci.h> +#include <drivers/arm/gicv2.h> +#include <drivers/arm/pl011.h> +#include <drivers/console.h> +#include <drivers/generic_delay_timer.h> +#include <lib/mmio.h> +#include <plat/common/platform.h> + +#include <hi3660.h> +#include <hisi_ipc.h> #include "hikey960_def.h" #include "hikey960_private.h" diff --git a/plat/hisilicon/hikey960/hikey960_bl_common.c b/plat/hisilicon/hikey960/hikey960_bl_common.c index 0cee69f9..89adccb2 100644 --- a/plat/hisilicon/hikey960/hikey960_bl_common.c +++ b/plat/hisilicon/hikey960/hikey960_bl_common.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <debug.h> -#include <delay_timer.h> -#include <hi3660.h> -#include <mmio.h> -#include <pl061_gpio.h> +#include <common/debug.h> +#include <drivers/arm/pl061_gpio.h> +#include <drivers/delay_timer.h> +#include <lib/mmio.h> +#include <hi3660.h> #include "hikey960_private.h" void hikey960_clk_init(void) diff --git a/plat/hisilicon/hikey960/hikey960_boardid.c b/plat/hisilicon/hikey960/hikey960_boardid.c index f39c1538..1e1126fb 100644 --- a/plat/hisilicon/hikey960/hikey960_boardid.c +++ b/plat/hisilicon/hikey960/hikey960_boardid.c @@ -5,12 +5,13 @@ */ #include <assert.h> -#include <debug.h> -#include <delay_timer.h> #include <errno.h> -#include <hi3660.h> -#include <mmio.h> +#include <common/debug.h> +#include <drivers/delay_timer.h> +#include <lib/mmio.h> + +#include <hi3660.h> #include "hikey960_private.h" #define ADC_ADCIN0 0 diff --git a/plat/hisilicon/hikey960/hikey960_def.h b/plat/hisilicon/hikey960/hikey960_def.h index 91d0af3c..d977c798 100644 --- a/plat/hisilicon/hikey960/hikey960_def.h +++ b/plat/hisilicon/hikey960/hikey960_def.h @@ -7,8 +7,8 @@ #ifndef HIKEY960_DEF_H #define HIKEY960_DEF_H -#include <common_def.h> -#include <tbbr_img_def.h> +#include <common/tbbr/tbbr_img_def.h> +#include <plat/common/common_def.h> #define DDR_BASE 0x0 #define DDR_SIZE 0xC0000000 diff --git a/plat/hisilicon/hikey960/hikey960_image_load.c b/plat/hisilicon/hikey960/hikey960_image_load.c index ad7be508..57cb1b22 100644 --- a/plat/hisilicon/hikey960/hikey960_image_load.c +++ b/plat/hisilicon/hikey960/hikey960_image_load.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <bl_common.h> -#include <desc_image_load.h> -#include <platform.h> +#include <common/bl_common.h> +#include <common/desc_image_load.h> +#include <plat/common/platform.h> /******************************************************************************* * This function flushes the data structures so that they are visible diff --git a/plat/hisilicon/hikey960/hikey960_io_storage.c b/plat/hisilicon/hikey960/hikey960_io_storage.c index cff3b0d2..a4e83897 100644 --- a/plat/hisilicon/hikey960/hikey960_io_storage.c +++ b/plat/hisilicon/hikey960/hikey960_io_storage.c @@ -4,21 +4,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <debug.h> #include <errno.h> -#include <firmware_image_package.h> -#include <io_block.h> -#include <io_driver.h> -#include <io_fip.h> -#include <io_memmap.h> -#include <io_storage.h> -#include <mmio.h> -#include <platform_def.h> -#include <semihosting.h> /* For FOPEN_MODE_... */ #include <string.h> -#include <ufs.h> + +#include <platform_def.h> + +#include <arch_helpers.h> +#include <common/debug.h> +#include <drivers/ufs.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 <drivers/io/io_storage.h> +#include <lib/mmio.h> +#include <lib/semihosting.h> +#include <tools_share/firmware_image_package.h> struct plat_io_policy { uintptr_t *dev_handle; diff --git a/plat/hisilicon/hikey960/hikey960_mcu_load.c b/plat/hisilicon/hikey960/hikey960_mcu_load.c index 7bf9a3d0..b9ae3136 100644 --- a/plat/hisilicon/hikey960/hikey960_mcu_load.c +++ b/plat/hisilicon/hikey960/hikey960_mcu_load.c @@ -4,16 +4,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <debug.h> -#include <delay_timer.h> #include <errno.h> -#include <hi3660.h> -#include <mmio.h> #include <string.h> +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <drivers/delay_timer.h> +#include <lib/mmio.h> + +#include <hi3660.h> + #define ADDR_CONVERT(addr) ((addr) < 0x40000 ? \ (addr) + 0xFFF30000 : \ (addr) + 0x40000000) diff --git a/plat/hisilicon/hikey960/hikey960_pm.c b/plat/hisilicon/hikey960/hikey960_pm.c index f1873eec..676cfa3f 100644 --- a/plat/hisilicon/hikey960/hikey960_pm.c +++ b/plat/hisilicon/hikey960/hikey960_pm.c @@ -4,19 +4,21 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <cci.h> -#include <debug.h> -#include <delay_timer.h> -#include <gicv2.h> + +#include <arch_helpers.h> +#include <common/debug.h> +#include <drivers/arm/cci.h> +#include <drivers/arm/gicv2.h> +#include <drivers/arm/pl011.h> +#include <drivers/delay_timer.h> +#include <lib/mmio.h> +#include <lib/psci/psci.h> + #include <hi3660.h> #include <hi3660_crg.h> -#include <mmio.h> -#include <pl011.h> -#include <psci.h> -#include "drivers/pwrc/hisi_pwrc.h" +#include "drivers/pwrc/hisi_pwrc.h" #include "hikey960_def.h" #include "hikey960_private.h" diff --git a/plat/hisilicon/hikey960/hikey960_private.h b/plat/hisilicon/hikey960/hikey960_private.h index 31d3a4ae..9a18dd62 100644 --- a/plat/hisilicon/hikey960/hikey960_private.h +++ b/plat/hisilicon/hikey960/hikey960_private.h @@ -7,7 +7,7 @@ #ifndef HIKEY960_PRIVATE_H #define HIKEY960_PRIVATE_H -#include <bl_common.h> +#include <common/bl_common.h> /* * Function and variable prototypes diff --git a/plat/hisilicon/hikey960/hikey960_tbbr.c b/plat/hisilicon/hikey960/hikey960_tbbr.c index e9f28b3b..e435ec2e 100644 --- a/plat/hisilicon/hikey960/hikey960_tbbr.c +++ b/plat/hisilicon/hikey960/hikey960_tbbr.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <platform.h> +#include <plat/common/platform.h> extern char hikey960_rotpk_hash[], hikey960_rotpk_hash_end[]; diff --git a/plat/hisilicon/hikey960/hikey960_topology.c b/plat/hisilicon/hikey960/hikey960_topology.c index 33637246..a242bb1d 100644 --- a/plat/hisilicon/hikey960/hikey960_topology.c +++ b/plat/hisilicon/hikey960/hikey960_topology.c @@ -3,9 +3,11 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch.h> + #include <platform_def.h> -#include <psci.h> + +#include <arch.h> +#include <lib/psci/psci.h> /* * The HiKey power domain tree descriptor. The cluster power domains diff --git a/plat/hisilicon/hikey960/include/plat_macros.S b/plat/hisilicon/hikey960/include/plat_macros.S index 3b126f65..8765562a 100644 --- a/plat/hisilicon/hikey960/include/plat_macros.S +++ b/plat/hisilicon/hikey960/include/plat_macros.S @@ -7,8 +7,8 @@ #ifndef PLAT_MACROS_S #define PLAT_MACROS_S -#include <cci.h> -#include <gicv2.h> +#include <drivers/arm/cci.h> +#include <drivers/arm/gicv2.h> #include <hi3660.h> #include <platform_def.h> diff --git a/plat/hisilicon/hikey960/include/platform_def.h b/plat/hisilicon/hikey960/include/platform_def.h index 427a1e75..3e2d79da 100644 --- a/plat/hisilicon/hikey960/include/platform_def.h +++ b/plat/hisilicon/hikey960/include/platform_def.h @@ -8,7 +8,8 @@ #define PLATFORM_DEF_H #include <arch.h> -#include <utils_def.h> +#include <lib/utils_def.h> + #include "../hikey960_def.h" /* Special value used to verify platform parameters from BL2 to BL3-1 */ diff --git a/plat/hisilicon/poplar/aarch64/platform_common.c b/plat/hisilicon/poplar/aarch64/platform_common.c index d408209d..fcd0a8bc 100644 --- a/plat/hisilicon/poplar/aarch64/platform_common.c +++ b/plat/hisilicon/poplar/aarch64/platform_common.c @@ -4,15 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <debug.h> -#include <delay_timer.h> #include <errno.h> -#include <mmio.h> -#include <platform.h> -#include <xlat_tables.h> + +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <drivers/delay_timer.h> +#include <lib/mmio.h> +#include <lib/xlat_tables/xlat_tables.h> +#include <plat/common/platform.h> + #include "hi3798cv200.h" #include "platform_def.h" diff --git a/plat/hisilicon/poplar/bl1_plat_setup.c b/plat/hisilicon/poplar/bl1_plat_setup.c index d0b12ad2..eb8ffe4f 100644 --- a/plat/hisilicon/poplar/bl1_plat_setup.c +++ b/plat/hisilicon/poplar/bl1_plat_setup.c @@ -4,22 +4,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <debug.h> -#include <dw_mmc.h> #include <errno.h> -#include <generic_delay_timer.h> -#include <mmc.h> -#include <mmio.h> -#include <pl011.h> -#include <pl061_gpio.h> -#include <platform.h> -#include <platform_def.h> #include <string.h> -#include <tbbr_img_def.h> -#include "../../bl1/bl1_private.h" + +#include <platform_def.h> + +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <common/tbbr/tbbr_img_def.h> +#include <drivers/arm/pl011.h> +#include <drivers/arm/pl061_gpio.h> +#include <drivers/generic_delay_timer.h> +#include <drivers/mmc.h> +#include <drivers/synopsys/dw_mmc.h> +#include <lib/mmio.h> +#include <plat/common/platform.h> + +#include "../../../bl1/bl1_private.h" #include "hi3798cv200.h" #include "plat_private.h" diff --git a/plat/hisilicon/poplar/bl2_plat_mem_params_desc.c b/plat/hisilicon/poplar/bl2_plat_mem_params_desc.c index c73ead8d..f683d750 100644 --- a/plat/hisilicon/poplar/bl2_plat_mem_params_desc.c +++ b/plat/hisilicon/poplar/bl2_plat_mem_params_desc.c @@ -4,11 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <bl_common.h> -#include <desc_image_load.h> -#include <platform.h> #include <platform_def.h> +#include <common/bl_common.h> +#include <common/desc_image_load.h> +#include <plat/common/platform.h> /******************************************************************************* * Following descriptor provides BL image/ep information that gets used diff --git a/plat/hisilicon/poplar/bl2_plat_setup.c b/plat/hisilicon/poplar/bl2_plat_setup.c index 3a3ed6a4..ff8e107d 100644 --- a/plat/hisilicon/poplar/bl2_plat_setup.c +++ b/plat/hisilicon/poplar/bl2_plat_setup.c @@ -4,21 +4,23 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <debug.h> -#include <desc_image_load.h> -#include <dw_mmc.h> #include <errno.h> -#include <generic_delay_timer.h> -#include <mmc.h> -#include <mmio.h> -#include <optee_utils.h> -#include <partition/partition.h> -#include <pl011.h> -#include <platform.h> #include <string.h> + +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <common/desc_image_load.h> +#include <drivers/arm/pl011.h> +#include <drivers/generic_delay_timer.h> +#include <drivers/partition/partition.h> +#include <drivers/synopsys/dw_mmc.h> +#include <drivers/mmc.h> +#include <lib/mmio.h> +#include <lib/optee_utils.h> +#include <plat/common/platform.h> + #include "hi3798cv200.h" #include "plat_private.h" diff --git a/plat/hisilicon/poplar/bl31_plat_setup.c b/plat/hisilicon/poplar/bl31_plat_setup.c index e2079f9e..69911e8d 100644 --- a/plat/hisilicon/poplar/bl31_plat_setup.c +++ b/plat/hisilicon/poplar/bl31_plat_setup.c @@ -4,21 +4,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch.h> -#include <arch_helpers.h> #include <assert.h> -#include <bl31.h> -#include <bl_common.h> -#include <cortex_a53.h> -#include <debug.h> #include <errno.h> -#include <generic_delay_timer.h> -#include <mmio.h> -#include <pl011.h> -#include <platform.h> -#include <platform_def.h> #include <stddef.h> #include <string.h> + +#include <platform_def.h> + +#include <arch.h> +#include <arch_helpers.h> +#include <bl31/bl31.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <cortex_a53.h> +#include <drivers/arm/pl011.h> +#include <drivers/generic_delay_timer.h> +#include <lib/mmio.h> +#include <plat/common/platform.h> + #include "hi3798cv200.h" #include "plat_private.h" diff --git a/plat/hisilicon/poplar/include/hi3798cv200.h b/plat/hisilicon/poplar/include/hi3798cv200.h index ddb43964..e31f4b3e 100644 --- a/plat/hisilicon/poplar/include/hi3798cv200.h +++ b/plat/hisilicon/poplar/include/hi3798cv200.h @@ -7,7 +7,7 @@ #ifndef HI3798CV200_H #define HI3798CV200_H -#include <utils_def.h> +#include <lib/utils_def.h> /* PL011 */ #define PL011_UART0_BASE (0xF8B00000) diff --git a/plat/hisilicon/poplar/include/plat_private.h b/plat/hisilicon/poplar/include/plat_private.h index 3aeccc42..a34f1384 100644 --- a/plat/hisilicon/poplar/include/plat_private.h +++ b/plat/hisilicon/poplar/include/plat_private.h @@ -7,7 +7,8 @@ #ifndef PLAT_PRIVATE_H #define PLAT_PRIVATE_H -#include <bl_common.h> +#include <common/bl_common.h> + #include "hi3798cv200.h" void plat_configure_mmu_el3(unsigned long total_base, diff --git a/plat/hisilicon/poplar/include/platform_def.h b/plat/hisilicon/poplar/include/platform_def.h index e39d9447..8f7a1559 100644 --- a/plat/hisilicon/poplar/include/platform_def.h +++ b/plat/hisilicon/poplar/include/platform_def.h @@ -8,11 +8,12 @@ #define PLATFORM_DEF_H #include <arch.h> -#include <common_def.h> -#include <gic_common.h> -#include <interrupt_props.h> -#include <tbbr/tbbr_img_def.h> -#include <utils_def.h> +#include <common/interrupt_props.h> +#include <common/tbbr/tbbr_img_def.h> +#include <drivers/arm/gic_common.h> +#include <lib/utils_def.h> +#include <plat/common/common_def.h> + #include "hi3798cv200.h" #include "poplar_layout.h" /* BL memory region sizes, etc */ diff --git a/plat/hisilicon/poplar/plat_pm.c b/plat/hisilicon/poplar/plat_pm.c index eccb0b0d..67ebca1c 100644 --- a/plat/hisilicon/poplar/plat_pm.c +++ b/plat/hisilicon/poplar/plat_pm.c @@ -4,16 +4,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <bl_common.h> -#include <context.h> -#include <context_mgmt.h> -#include <debug.h> -#include <mmio.h> -#include <platform.h> + #include <platform_def.h> -#include <psci.h> + +#include <arch_helpers.h> +#include <common/bl_common.h> +#include <common/debug.h> +#include <context.h> +#include <lib/el3_runtime/context_mgmt.h> +#include <lib/mmio.h> +#include <lib/psci/psci.h> +#include <plat/common/platform.h> + #include "hi3798cv200.h" #include "plat_private.h" diff --git a/plat/hisilicon/poplar/plat_storage.c b/plat/hisilicon/poplar/plat_storage.c index 925274ce..a17e0f1a 100644 --- a/plat/hisilicon/poplar/plat_storage.c +++ b/plat/hisilicon/poplar/plat_storage.c @@ -4,23 +4,25 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <debug.h> -#include <firmware_image_package.h> -#include <io_block.h> -#include <io_driver.h> -#include <io_fip.h> -#include <io_memmap.h> -#include <io_storage.h> -#include <mmc.h> -#include <mmio.h> -#include <partition/partition.h> -#include <semihosting.h> #include <string.h> -#include <tbbr_img_def.h> -#include <utils.h> -#include "platform_def.h" + +#include <platform_def.h> + +#include <arch_helpers.h> +#include <common/debug.h> +#include <common/tbbr/tbbr_img_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 <drivers/io/io_storage.h> +#include <drivers/mmc.h> +#include <drivers/partition/partition.h> +#include <lib/mmio.h> +#include <lib/semihosting.h> +#include <lib/utils.h> +#include <tools_share/firmware_image_package.h> #if !POPLAR_RECOVERY static const io_dev_connector_t *emmc_dev_con; diff --git a/plat/hisilicon/poplar/plat_topology.c b/plat/hisilicon/poplar/plat_topology.c index bb53c6b1..764008e9 100644 --- a/plat/hisilicon/poplar/plat_topology.c +++ b/plat/hisilicon/poplar/plat_topology.c @@ -4,9 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <platform_def.h> + #include <arch.h> -#include <psci.h> -#include "platform_def.h" +#include <lib/psci/psci.h> + #include "plat_private.h" const unsigned char hisi_power_domain_tree_desc[] = { diff --git a/plat/hisilicon/poplar/platform.mk b/plat/hisilicon/poplar/platform.mk index 0aaa7074..eca14125 100644 --- a/plat/hisilicon/poplar/platform.mk +++ b/plat/hisilicon/poplar/platform.mk @@ -54,9 +54,7 @@ $(eval $(call add_define,PLAT_PL061_MAX_GPIOS)) PLAT_INCLUDES := -Iplat/hisilicon/poplar/include \ -Iplat/hisilicon/poplar \ - -Iinclude/common/tbbr \ - -Iinclude/drivers/synopsys \ - -Iinclude/drivers/io + -Iinclude/common/tbbr PLAT_BL_COMMON_SOURCES := \ lib/xlat_tables/aarch64/xlat_tables.c \ diff --git a/plat/hisilicon/poplar/poplar_gicv2.c b/plat/hisilicon/poplar/poplar_gicv2.c index 1c1be47f..59f7b76e 100644 --- a/plat/hisilicon/poplar/poplar_gicv2.c +++ b/plat/hisilicon/poplar/poplar_gicv2.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <gicv2.h> -#include <platform.h> #include <platform_def.h> +#include <drivers/arm/gicv2.h> +#include <plat/common/platform.h> + /****************************************************************************** * On a GICv2 system, the Group 1 secure interrupts are treated as Group 0 * interrupts. diff --git a/plat/hisilicon/poplar/poplar_image_load.c b/plat/hisilicon/poplar/poplar_image_load.c index 32ca36db..0ab1ca49 100644 --- a/plat/hisilicon/poplar/poplar_image_load.c +++ b/plat/hisilicon/poplar/poplar_image_load.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <bl_common.h> -#include <desc_image_load.h> -#include <platform.h> +#include <common/bl_common.h> +#include <common/desc_image_load.h> +#include <plat/common/platform.h> /******************************************************************************* * This function flushes the data structures so that they are visible |