Merge pull request #1784 from antonio-nino-diaz-arm/an/includes-arm
plat/arm: Cleanup of includes and drivers
This commit is contained in:
Antonio Niño Díaz
GitHub
commit
83a2285ec8
|
|
@ -9,12 +9,10 @@
|
|||
#include <platform_def.h>
|
||||
|
||||
#include <arch_helpers.h>
|
||||
#include <drivers/arm/css/css_mhu.h>
|
||||
#include <lib/bakery_lock.h>
|
||||
#include <lib/mmio.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
#include "css_mhu.h"
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
/* SCP MHU secure channel registers */
|
||||
#define SCP_INTR_S_STAT 0x200
|
||||
|
|
@ -7,9 +7,8 @@
|
|||
#include <platform_def.h>
|
||||
|
||||
#include <arch_helpers.h>
|
||||
|
||||
#include "css_mhu_doorbell.h"
|
||||
#include "../scmi/scmi.h"
|
||||
#include <drivers/arm/css/css_mhu_doorbell.h>
|
||||
#include <drivers/arm/css/scmi.h>
|
||||
|
||||
void mhu_ring_doorbell(struct scmi_channel_plat_info *plat_info)
|
||||
{
|
||||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
#include <arch_helpers.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/css/scmi.h>
|
||||
|
||||
#include "scmi.h"
|
||||
#include "scmi_private.h"
|
||||
|
||||
/*
|
||||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
#include <arch_helpers.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/css/scmi.h>
|
||||
|
||||
#include "scmi.h"
|
||||
#include "scmi_private.h"
|
||||
|
||||
#if HW_ASSISTED_COHERENCY
|
||||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
#include <arch_helpers.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/css/scmi.h>
|
||||
|
||||
#include "scmi.h"
|
||||
#include "scmi_private.h"
|
||||
|
||||
/*
|
||||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
#include <arch_helpers.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/css/scmi.h>
|
||||
|
||||
#include "scmi.h"
|
||||
#include "scmi_private.h"
|
||||
|
||||
/*
|
||||
|
|
@ -9,13 +9,12 @@
|
|||
|
||||
#include <arch_helpers.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/css/css_mhu.h>
|
||||
#include <drivers/arm/css/css_scp.h>
|
||||
#include <drivers/arm/css/css_scpi.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include "../mhu/css_mhu.h"
|
||||
#include "../scpi/css_scpi.h"
|
||||
#include "css_scp.h"
|
||||
|
||||
/* ID of the MHU slot used for the BOM protocol */
|
||||
#define BOM_MHU_SLOT_ID 0
|
||||
|
||||
|
|
@ -9,15 +9,13 @@
|
|||
|
||||
#include <arch_helpers.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/css/css_scp.h>
|
||||
#include <drivers/arm/css/scmi.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/arm/css/common/css_pm.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include <css_pm.h>
|
||||
#include <plat_arm.h>
|
||||
|
||||
#include "../scmi/scmi.h"
|
||||
#include "css_scp.h"
|
||||
|
||||
/*
|
||||
* This file implements the SCP helper functions using SCMI protocol.
|
||||
*/
|
||||
|
|
@ -8,12 +8,10 @@
|
|||
|
||||
#include <arch_helpers.h>
|
||||
#include <common/debug.h>
|
||||
|
||||
#include <css_pm.h>
|
||||
#include <plat_arm.h>
|
||||
|
||||
#include "../scpi/css_scpi.h"
|
||||
#include "css_scp.h"
|
||||
#include <drivers/arm/css/css_scp.h>
|
||||
#include <drivers/arm/css/css_scpi.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/arm/css/common/css_pm.h>
|
||||
|
||||
/*
|
||||
* This file implements the SCP power management functions using SCPI protocol.
|
||||
|
|
@ -9,13 +9,12 @@
|
|||
|
||||
#include <arch_helpers.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/css/css_scp.h>
|
||||
#include <drivers/arm/css/sds.h>
|
||||
#include <drivers/delay_timer.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include "css_scp.h"
|
||||
#include "../sds/sds.h"
|
||||
|
||||
int css_scp_boot_image_xfer(void *image, unsigned int image_size)
|
||||
{
|
||||
int ret;
|
||||
|
|
@ -9,13 +9,12 @@
|
|||
|
||||
#include <arch_helpers.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/css/css_mhu.h>
|
||||
#include <drivers/arm/css/css_scpi.h>
|
||||
#include <lib/utils.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include "../mhu/css_mhu.h"
|
||||
#include "css_scpi.h"
|
||||
|
||||
#define SCPI_SHARED_MEM_SCP_TO_AP PLAT_CSS_SCP_COM_SHARED_MEM_BASE
|
||||
#define SCPI_SHARED_MEM_AP_TO_SCP (PLAT_CSS_SCP_COM_SHARED_MEM_BASE \
|
||||
+ 0x100)
|
||||
|
|
@ -6,8 +6,9 @@
|
|||
|
||||
#include <arch.h>
|
||||
#include <asm_macros.S>
|
||||
#include <drivers/arm/css/sds.h>
|
||||
#include <platform_def.h>
|
||||
#include "../sds.h"
|
||||
|
||||
#include "../sds_private.h"
|
||||
|
||||
.globl sds_get_primary_cpu_id
|
||||
|
|
@ -6,8 +6,9 @@
|
|||
|
||||
#include <arch.h>
|
||||
#include <asm_macros.S>
|
||||
#include <drivers/arm/css/sds.h>
|
||||
#include <platform_def.h>
|
||||
#include "../sds.h"
|
||||
|
||||
#include "../sds_private.h"
|
||||
|
||||
.globl sds_get_primary_cpu_id
|
||||
|
|
@ -10,9 +10,9 @@
|
|||
|
||||
#include <arch_helpers.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/css/sds.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include "sds.h"
|
||||
#include "sds_private.h"
|
||||
|
||||
/*
|
||||
|
|
@ -4,14 +4,12 @@
|
|||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <drivers/arm/fvp/fvp_pwrc.h>
|
||||
#include <lib/bakery_lock.h>
|
||||
#include <lib/mmio.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include "../../fvp_private.h"
|
||||
#include "fvp_pwrc.h"
|
||||
|
||||
/*
|
||||
* TODO: Someday there will be a generic power controller api. At the moment
|
||||
* each platform has its own pwrc so just exporting functions is fine.
|
||||
|
|
@ -37,6 +37,8 @@
|
|||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
/*******************************************************************************
|
||||
* Function & variable prototypes
|
||||
******************************************************************************/
|
||||
|
|
@ -8,11 +8,10 @@
|
|||
#define BOARD_CSS_DEF_H
|
||||
|
||||
#include <lib/utils_def.h>
|
||||
#include <plat/arm/board/common/v2m_def.h>
|
||||
#include <plat/arm/soc/common/soc_css_def.h>
|
||||
#include <plat/common/common_def.h>
|
||||
|
||||
#include <soc_css_def.h>
|
||||
#include <v2m_def.h>
|
||||
|
||||
/*
|
||||
* Definitions common to all ARM CSS-based development platforms
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#ifndef V2M_DEF_H
|
||||
#define V2M_DEF_H
|
||||
|
||||
#include <lib/xlat_tables/xlat_tables_compat.h>
|
||||
#include <lib/utils_def.h>
|
||||
|
||||
/* V2M motherboard system registers & offsets */
|
||||
#define V2M_SYSREGS_BASE UL(0x1c010000)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,9 @@
|
|||
|
||||
#include <assert.h>
|
||||
|
||||
#include <common/debug.h>
|
||||
#include <lib/utils.h>
|
||||
#include <lib/xlat_tables/xlat_tables_compat.h>
|
||||
|
||||
/*
|
||||
* All the regions defined in mem_region_t must have the following properties
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@
|
|||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
||||
PLAT_INCLUDES += -Iinclude/plat/arm/board/common/
|
||||
|
||||
PLAT_BL_COMMON_SOURCES += drivers/arm/pl011/${ARCH}/pl011_console.S \
|
||||
plat/arm/board/common/${ARCH}/board_arm_helpers.S
|
||||
|
||||
|
|
|
|||
|
|
@ -6,10 +6,9 @@
|
|||
|
||||
#include <arch.h>
|
||||
#include <asm_macros.S>
|
||||
#include <drivers/arm/fvp/fvp_pwrc.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include "../drivers/pwrc/fvp_pwrc.h"
|
||||
|
||||
.globl plat_secondary_cold_boot_setup
|
||||
.globl plat_get_my_entrypoint
|
||||
.globl plat_is_my_cpu_primary
|
||||
|
|
|
|||
|
|
@ -8,10 +8,9 @@
|
|||
#include <asm_macros.S>
|
||||
#include <drivers/arm/gicv2.h>
|
||||
#include <drivers/arm/gicv3.h>
|
||||
#include <drivers/arm/fvp/fvp_pwrc.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include "../drivers/pwrc/fvp_pwrc.h"
|
||||
|
||||
.globl plat_secondary_cold_boot_setup
|
||||
.globl plat_get_my_entrypoint
|
||||
.globl plat_is_my_cpu_primary
|
||||
|
|
|
|||
|
|
@ -5,10 +5,9 @@
|
|||
*/
|
||||
|
||||
#include <common/tbbr/tbbr_img_def.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
#include "fvp_private.h"
|
||||
|
||||
/*******************************************************************************
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
#include "fvp_private.h"
|
||||
|
||||
void bl2_el3_early_platform_setup(u_register_t arg0 __unused,
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@
|
|||
#include <drivers/arm/sp804_delay_timer.h>
|
||||
#include <drivers/generic_delay_timer.h>
|
||||
#include <lib/mmio.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include "fvp_private.h"
|
||||
|
||||
void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1, u_register_t arg2, u_register_t arg3)
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include "fvp_private.h"
|
||||
|
||||
void bl2u_early_platform_setup(struct meminfo *mem_layout, void *plat_info)
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
*/
|
||||
|
||||
#include <drivers/arm/smmu_v3.h>
|
||||
#include <plat/arm/common/arm_config.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <arm_config.h>
|
||||
#include <plat_arm.h>
|
||||
#include "fvp_private.h"
|
||||
|
||||
void __init bl31_early_platform_setup2(u_register_t arg0,
|
||||
|
|
|
|||
|
|
@ -12,13 +12,12 @@
|
|||
#include <drivers/arm/gicv2.h>
|
||||
#include <lib/mmio.h>
|
||||
#include <lib/xlat_tables/xlat_tables_compat.h>
|
||||
#include <plat/arm/common/arm_config.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <platform_def.h>
|
||||
#include <services/secure_partition.h>
|
||||
|
||||
#include <arm_config.h>
|
||||
#include <plat_arm.h>
|
||||
|
||||
#include "fvp_private.h"
|
||||
|
||||
/* Defines for GIC Driver build time selection */
|
||||
|
|
|
|||
|
|
@ -11,10 +11,9 @@
|
|||
#include <drivers/io/io_semihosting.h>
|
||||
#include <drivers/io/io_storage.h>
|
||||
#include <lib/semihosting.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/common_def.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
/* Semihosting filenames */
|
||||
#define BL2_IMAGE_NAME "bl2.bin"
|
||||
#define BL31_IMAGE_NAME "bl31.bin"
|
||||
|
|
|
|||
|
|
@ -10,17 +10,15 @@
|
|||
#include <arch_helpers.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/gicv3.h>
|
||||
#include <drivers/arm/fvp/fvp_pwrc.h>
|
||||
#include <lib/extensions/spe.h>
|
||||
#include <lib/mmio.h>
|
||||
#include <lib/psci/psci.h>
|
||||
#include <plat/arm/common/arm_config.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include <arm_config.h>
|
||||
#include <plat_arm.h>
|
||||
|
||||
#include "../../../../drivers/arm/gic/v3/gicv3_private.h"
|
||||
#include "drivers/pwrc/fvp_pwrc.h"
|
||||
#include "fvp_private.h"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
#ifndef FVP_PRIVATE_H
|
||||
#define FVP_PRIVATE_H
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
/*******************************************************************************
|
||||
* Function and variable prototypes
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <arm_config.h>
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/arm_config.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
/*
|
||||
* We assume that all security programming is done by the primary core.
|
||||
|
|
|
|||
|
|
@ -7,13 +7,12 @@
|
|||
#include <platform_def.h>
|
||||
|
||||
#include <arch.h>
|
||||
#include <drivers/arm/fvp/fvp_pwrc.h>
|
||||
#include <lib/cassert.h>
|
||||
#include <plat/arm/common/arm_config.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <arm_config.h>
|
||||
#include "drivers/pwrc/fvp_pwrc.h"
|
||||
|
||||
/* The FVP power domain tree descriptor */
|
||||
static unsigned char fvp_power_domain_tree_desc[FVP_CLUSTER_COUNT + 2];
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#ifndef PLAT_LD_S
|
||||
#define PLAT_LD_S
|
||||
|
||||
#include <arm_tzc_dram.ld.S>
|
||||
#include <arm_reclaim_init.ld.S>
|
||||
#include <plat/arm/common/arm_tzc_dram.ld.S>
|
||||
#include <plat/arm/common/arm_reclaim_init.ld.S>
|
||||
|
||||
#endif /* PLAT_LD_S */
|
||||
|
|
|
|||
|
|
@ -7,25 +7,13 @@
|
|||
#ifndef PLATFORM_DEF_H
|
||||
#define PLATFORM_DEF_H
|
||||
|
||||
/* Enable the dynamic translation tables library. */
|
||||
#ifdef AARCH32
|
||||
# if defined(IMAGE_BL32) && RESET_TO_SP_MIN
|
||||
# define PLAT_XLAT_TABLES_DYNAMIC 1
|
||||
# endif
|
||||
#else
|
||||
# if defined(IMAGE_BL31) && (RESET_TO_BL31 || (ENABLE_SPM && !SPM_MM))
|
||||
# define PLAT_XLAT_TABLES_DYNAMIC 1
|
||||
# endif
|
||||
#endif /* AARCH32 */
|
||||
|
||||
#include <drivers/arm/tzc400.h>
|
||||
#include <lib/utils_def.h>
|
||||
#include <plat/arm/board/common/v2m_def.h>
|
||||
#include <plat/arm/common/arm_def.h>
|
||||
#include <plat/arm/common/arm_spm_def.h>
|
||||
#include <plat/common/common_def.h>
|
||||
|
||||
#include <arm_def.h>
|
||||
#include <arm_spm_def.h>
|
||||
#include <v2m_def.h>
|
||||
|
||||
#include "../fvp_def.h"
|
||||
|
||||
/* Required platform porting definitions */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
|
||||
# Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
|
@ -146,14 +146,14 @@ endif
|
|||
BL2U_SOURCES += plat/arm/board/fvp/fvp_bl2u_setup.c \
|
||||
${FVP_SECURITY_SOURCES}
|
||||
|
||||
BL31_SOURCES += drivers/arm/smmu/smmu_v3.c \
|
||||
BL31_SOURCES += drivers/arm/fvp/fvp_pwrc.c \
|
||||
drivers/arm/smmu/smmu_v3.c \
|
||||
drivers/cfi/v2m/v2m_flash.c \
|
||||
lib/utils/mem_region.c \
|
||||
plat/arm/board/fvp/fvp_bl31_setup.c \
|
||||
plat/arm/board/fvp/fvp_pm.c \
|
||||
plat/arm/board/fvp/fvp_topology.c \
|
||||
plat/arm/board/fvp/aarch64/fvp_helpers.S \
|
||||
plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c \
|
||||
plat/arm/common/arm_nor_psci_mem_protect.c \
|
||||
${FVP_CPU_LIBS} \
|
||||
${FVP_GIC_SOURCES} \
|
||||
|
|
@ -231,6 +231,22 @@ ifeq (${ARCH},aarch32)
|
|||
NEED_BL32 := yes
|
||||
endif
|
||||
|
||||
# Enable the dynamic translation tables library.
|
||||
ifeq (${ARCH},aarch32)
|
||||
ifeq (${RESET_TO_SP_MIN},1)
|
||||
BL32_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
|
||||
endif
|
||||
else
|
||||
ifeq (${RESET_TO_BL31},1)
|
||||
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
|
||||
endif
|
||||
ifeq (${ENABLE_SPM},1)
|
||||
ifeq (${SPM_MM},0)
|
||||
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
# Add support for platform supplied linker script for BL31 build
|
||||
$(eval $(call add_define,PLAT_EXTRA_LD_SCRIPT))
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
#include "../fvp_private.h"
|
||||
|
||||
void plat_arm_sp_min_early_platform_setup(u_register_t arg0, u_register_t arg1,
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
#
|
||||
|
||||
# SP_MIN source files specific to FVP platform
|
||||
BL32_SOURCES += drivers/cfi/v2m/v2m_flash.c \
|
||||
BL32_SOURCES += drivers/arm/fvp/fvp_pwrc.c \
|
||||
drivers/cfi/v2m/v2m_flash.c \
|
||||
lib/utils/mem_region.c \
|
||||
plat/arm/board/fvp/aarch32/fvp_helpers.S \
|
||||
plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c \
|
||||
plat/arm/board/fvp/fvp_pm.c \
|
||||
plat/arm/board/fvp/fvp_topology.c \
|
||||
plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
#include "../fvp_private.h"
|
||||
|
||||
void tsp_early_platform_setup(void)
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
#
|
||||
|
||||
# TSP source files specific to FVP platform
|
||||
BL32_SOURCES += plat/arm/board/fvp/aarch64/fvp_helpers.S \
|
||||
plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c \
|
||||
BL32_SOURCES += drivers/arm/fvp/fvp_pwrc.c \
|
||||
plat/arm/board/fvp/aarch64/fvp_helpers.S \
|
||||
plat/arm/board/fvp/fvp_topology.c \
|
||||
plat/arm/board/fvp/tsp/fvp_tsp_setup.c \
|
||||
${FVP_GIC_SOURCES}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2014-2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2014-2019, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -7,29 +7,17 @@
|
|||
#ifndef PLATFORM_DEF_H
|
||||
#define PLATFORM_DEF_H
|
||||
|
||||
/* Enable the dynamic translation tables library. */
|
||||
#ifdef AARCH32
|
||||
# if defined(IMAGE_BL32) && RESET_TO_SP_MIN
|
||||
# define PLAT_XLAT_TABLES_DYNAMIC 1
|
||||
# endif
|
||||
#else
|
||||
# if defined(IMAGE_BL31) && RESET_TO_BL31
|
||||
# define PLAT_XLAT_TABLES_DYNAMIC 1
|
||||
# endif
|
||||
#endif /* AARCH32 */
|
||||
|
||||
|
||||
#include <drivers/arm/tzc400.h>
|
||||
#if TRUSTED_BOARD_BOOT
|
||||
#include <drivers/auth/mbedtls/mbedtls_config.h>
|
||||
#endif
|
||||
#include <plat/arm/board/common/board_css_def.h>
|
||||
#include <plat/arm/board/common/v2m_def.h>
|
||||
#include <plat/arm/common/arm_def.h>
|
||||
#include <plat/arm/css/common/css_def.h>
|
||||
#include <plat/arm/soc/common/soc_css_def.h>
|
||||
#include <plat/common/common_def.h>
|
||||
|
||||
#include <arm_def.h>
|
||||
#include <board_css_def.h>
|
||||
#include <css_def.h>
|
||||
#include <soc_css_def.h>
|
||||
#include <v2m_def.h>
|
||||
#include "../juno_def.h"
|
||||
|
||||
/* Required platform porting definitions */
|
||||
|
|
|
|||
|
|
@ -9,13 +9,12 @@
|
|||
#include <common/bl_common.h>
|
||||
#include <common/debug.h>
|
||||
#include <common/tbbr/tbbr_img_def.h>
|
||||
#include <drivers/arm/css/sds.h>
|
||||
#include <drivers/arm/sp805.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <sds.h>
|
||||
|
||||
void juno_reset_to_aarch32_state(void);
|
||||
|
||||
static int is_watchdog_reset(void)
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@
|
|||
|
||||
#include <common/bl_common.h>
|
||||
#include <common/desc_image_load.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
#if JUNO_AARCH32_EL3_RUNTIME
|
||||
/*******************************************************************************
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
#include <platform_def.h>
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
/*
|
||||
* Table of memory regions for different BL stages to map using the MMU.
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <scmi.h>
|
||||
#include <drivers/arm/css/scmi.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
const plat_psci_ops_t *plat_arm_psci_override_pm_ops(plat_psci_ops_t *ops)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@
|
|||
#include <drivers/arm/nic_400.h>
|
||||
#include <lib/mmio.h>
|
||||
#include <platform_def.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/arm/soc/common/soc_css.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <soc_css.h>
|
||||
#include "juno_tzmp1_def.h"
|
||||
|
||||
#ifdef JUNO_TZMP1
|
||||
|
|
|
|||
|
|
@ -4,14 +4,13 @@
|
|||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <drivers/arm/css/css_mhu_doorbell.h>
|
||||
#include <drivers/arm/css/scmi.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/arm/css/common/css_pm.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include <css_pm.h>
|
||||
#include <plat_arm.h>
|
||||
#include "../../css/drivers/scmi/scmi.h"
|
||||
#include "../../css/drivers/mhu/css_mhu_doorbell.h"
|
||||
|
||||
#if CSS_USE_SCMI_SDS_DRIVER
|
||||
static scmi_channel_plat_info_t juno_scmi_plat_info = {
|
||||
.scmi_mbx_mem = CSS_SCMI_PAYLOAD_BASE,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#
|
||||
# Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved.
|
||||
# Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
|
@ -26,9 +26,7 @@ endif
|
|||
# SCP during power management operations and for SCP RAM Firmware transfer.
|
||||
CSS_USE_SCMI_SDS_DRIVER := 1
|
||||
|
||||
PLAT_INCLUDES := -Iplat/arm/board/juno/include \
|
||||
-Iplat/arm/css/drivers/scmi \
|
||||
-Iplat/arm/css/drivers/sds
|
||||
PLAT_INCLUDES := -Iplat/arm/board/juno/include
|
||||
|
||||
PLAT_BL_COMMON_SOURCES := plat/arm/board/juno/${ARCH}/juno_helpers.S \
|
||||
plat/arm/board/juno/juno_common.c
|
||||
|
|
@ -88,7 +86,7 @@ BL31_SOURCES += drivers/cfi/v2m/v2m_flash.c \
|
|||
${JUNO_SECURITY_SOURCES}
|
||||
|
||||
ifeq (${CSS_USE_SCMI_SDS_DRIVER},1)
|
||||
BL1_SOURCES += plat/arm/css/drivers/sds/sds.c
|
||||
BL1_SOURCES += drivers/arm/css/sds/sds.c
|
||||
endif
|
||||
|
||||
endif
|
||||
|
|
@ -134,6 +132,17 @@ SKIP_A57_L1_FLUSH_PWR_DWN := 1
|
|||
# Do not enable SVE
|
||||
ENABLE_SVE_FOR_NS := 0
|
||||
|
||||
# Enable the dynamic translation tables library.
|
||||
ifeq (${ARCH},aarch32)
|
||||
ifeq (${RESET_TO_SP_MIN},1)
|
||||
BL32_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
|
||||
endif
|
||||
else
|
||||
ifeq (${RESET_TO_BL31},1)
|
||||
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
|
||||
endif
|
||||
endif
|
||||
|
||||
include plat/arm/board/common/board_common.mk
|
||||
include plat/arm/common/arm_common.mk
|
||||
include plat/arm/soc/common/soc_css.mk
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@
|
|||
#ifndef PLATFORM_DEF_H
|
||||
#define PLATFORM_DEF_H
|
||||
|
||||
#include <arm_def.h>
|
||||
#include <css_def.h>
|
||||
#include <v2m_def.h>
|
||||
#include <plat/arm/board/common/v2m_def.h>
|
||||
#include <plat/arm/common/arm_def.h>
|
||||
#include <plat/arm/css/common/css_def.h>
|
||||
|
||||
/* UART related constants */
|
||||
#define PLAT_ARM_BOOT_UART_BASE 0x2A400000
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
|
||||
#include <platform_def.h>
|
||||
|
||||
#include "../../css/drivers/scmi/scmi.h"
|
||||
#include "../../css/drivers/mhu/css_mhu_doorbell.h"
|
||||
#include <plat_arm.h>
|
||||
#include <drivers/arm/css/css_mhu_doorbell.h>
|
||||
#include <drivers/arm/css/scmi.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
static scmi_channel_plat_info_t n1sdp_scmi_plat_info = {
|
||||
.scmi_mbx_mem = N1SDP_SCMI_PAYLOAD_BASE,
|
||||
|
|
|
|||
|
|
@ -8,10 +8,9 @@
|
|||
|
||||
#include <common/bl_common.h>
|
||||
#include <common/debug.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
/*
|
||||
* Table of regions to map using the MMU.
|
||||
* Replace or extend the below regions as required
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
/* Topology */
|
||||
typedef struct n1sdp_topology {
|
||||
|
|
|
|||
|
|
@ -13,10 +13,9 @@
|
|||
#include <common/bl_common.h>
|
||||
#include <common/debug.h>
|
||||
#include <lib/utils.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
/* Struct to keep track of usable memory */
|
||||
typedef struct bl1_mem_info {
|
||||
uintptr_t mem_base;
|
||||
|
|
|
|||
|
|
@ -14,10 +14,9 @@
|
|||
#include <drivers/arm/sp805.h>
|
||||
#include <lib/utils.h>
|
||||
#include <lib/xlat_tables/xlat_tables_compat.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
/* Weak definitions may be overridden in specific ARM standard platform */
|
||||
#pragma weak bl1_early_platform_setup
|
||||
#pragma weak bl1_plat_arch_setup
|
||||
|
|
|
|||
|
|
@ -7,11 +7,10 @@
|
|||
#include <assert.h>
|
||||
|
||||
#include <drivers/generic_delay_timer.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
#pragma weak bl2_el3_early_platform_setup
|
||||
#pragma weak bl2_el3_plat_arch_setup
|
||||
#pragma weak bl2_el3_plat_prepare_exit
|
||||
|
|
|
|||
|
|
@ -18,10 +18,9 @@
|
|||
#include <lib/optee_utils.h>
|
||||
#endif
|
||||
#include <lib/utils.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
/* Data structure which holds the extents of the trusted SRAM for BL2 */
|
||||
static meminfo_t bl2_tzram_layout __aligned(CACHE_WRITEBACK_GRANULE);
|
||||
|
||||
|
|
|
|||
|
|
@ -12,10 +12,9 @@
|
|||
#include <arch_helpers.h>
|
||||
#include <common/bl_common.h>
|
||||
#include <drivers/generic_delay_timer.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
/* Weak definitions may be overridden in specific ARM standard platform */
|
||||
#pragma weak bl2u_platform_setup
|
||||
#pragma weak bl2u_early_platform_setup
|
||||
|
|
|
|||
|
|
@ -15,11 +15,10 @@
|
|||
#include <lib/mmio.h>
|
||||
#include <lib/utils.h>
|
||||
#include <lib/xlat_tables/xlat_tables_compat.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
/*
|
||||
* Placeholder variables for copying the arguments that have been passed to
|
||||
* BL31 from BL2.
|
||||
|
|
|
|||
|
|
@ -9,8 +9,7 @@
|
|||
#include <arch.h>
|
||||
#include <drivers/arm/cci.h>
|
||||
#include <lib/utils.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
static const int cci_map[] = {
|
||||
PLAT_ARM_CCI_CLUSTER0_SL_IFACE_IX,
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@
|
|||
|
||||
#include <arch.h>
|
||||
#include <drivers/arm/ccn.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
static const unsigned char master_to_rn_id_map[] = {
|
||||
PLAT_ARM_CLUSTER_TO_CCN_ID_MAP
|
||||
|
|
|
|||
|
|
@ -14,11 +14,10 @@
|
|||
#include <common/romlib.h>
|
||||
#include <lib/mmio.h>
|
||||
#include <lib/xlat_tables/xlat_tables_compat.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <services/secure_partition.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
/* Weak definitions may be overridden in specific ARM standard platform */
|
||||
#pragma weak plat_get_ns_image_entrypoint
|
||||
#pragma weak plat_arm_get_mmap
|
||||
|
|
|
|||
|
|
@ -141,9 +141,6 @@ ifeq (${ARM_CRYPTOCELL_INTEG},1)
|
|||
endif
|
||||
endif
|
||||
|
||||
PLAT_INCLUDES += -Iinclude/common/tbbr \
|
||||
-Iinclude/plat/arm/common
|
||||
|
||||
ifeq (${ARCH}, aarch64)
|
||||
PLAT_INCLUDES += -Iinclude/plat/arm/common/aarch64
|
||||
endif
|
||||
|
|
@ -257,8 +254,6 @@ ifneq (${TRUSTED_BOARD_BOOT},0)
|
|||
drivers/auth/img_parser_mod.c \
|
||||
drivers/auth/tbbr/tbbr_cot.c \
|
||||
|
||||
PLAT_INCLUDES += -Iinclude/bl1/tbbr
|
||||
|
||||
BL1_SOURCES += ${AUTH_SOURCES} \
|
||||
bl1/tbbr/tbbr_img_desc.c \
|
||||
plat/arm/common/arm_bl1_fwu.c \
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@
|
|||
#include <common/debug.h>
|
||||
#include <drivers/arm/pl011.h>
|
||||
#include <drivers/console.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
/*******************************************************************************
|
||||
* Functions that set up the console
|
||||
|
|
|
|||
|
|
@ -15,11 +15,10 @@
|
|||
#if TRUSTED_BOARD_BOOT
|
||||
#include <drivers/auth/mbedtls/mbedtls_config.h>
|
||||
#endif
|
||||
#include <plat/arm/common/arm_dyn_cfg_helpers.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <arm_dyn_cfg_helpers.h>
|
||||
#include <plat_arm.h>
|
||||
|
||||
/* Variable to store the address to TB_FW_CONFIG passed from BL1 */
|
||||
static void *tb_fw_cfg_dtb;
|
||||
static size_t tb_fw_cfg_dtb_size;
|
||||
|
|
|
|||
|
|
@ -10,9 +10,8 @@
|
|||
|
||||
#include <common/desc_image_load.h>
|
||||
#include <common/fdt_wrappers.h>
|
||||
|
||||
#include <arm_dyn_cfg_helpers.h>
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/arm_dyn_cfg_helpers.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
#define DTB_PROP_MBEDTLS_HEAP_ADDR "mbedtls_heap_addr"
|
||||
#define DTB_PROP_MBEDTLS_HEAP_SIZE "mbedtls_heap_size"
|
||||
|
|
|
|||
|
|
@ -13,10 +13,9 @@
|
|||
#include <common/debug.h>
|
||||
#include <drivers/cfi/v2m_flash.h>
|
||||
#include <drivers/console.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
#pragma weak plat_arm_error_handler
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -7,10 +7,9 @@
|
|||
#include <platform_def.h>
|
||||
|
||||
#include <drivers/arm/gicv2.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
/******************************************************************************
|
||||
* The following functions are defined as weak to allow a platform to override
|
||||
* the way the GICv2 driver is initialised and used.
|
||||
|
|
|
|||
|
|
@ -9,10 +9,9 @@
|
|||
#include <common/interrupt_props.h>
|
||||
#include <drivers/arm/gicv3.h>
|
||||
#include <lib/utils.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
/******************************************************************************
|
||||
* The following functions are defined as weak to allow a platform to override
|
||||
* the way the GICv3 driver is initialised and used.
|
||||
|
|
|
|||
|
|
@ -7,10 +7,9 @@
|
|||
#include <assert.h>
|
||||
#include <common/bl_common.h>
|
||||
#include <common/desc_image_load.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
#pragma weak plat_flush_next_bl_params
|
||||
#pragma weak plat_get_bl_image_load_info
|
||||
#pragma weak plat_get_next_bl_params
|
||||
|
|
|
|||
|
|
@ -15,11 +15,10 @@
|
|||
#include <drivers/io/io_memmap.h>
|
||||
#include <drivers/io/io_storage.h>
|
||||
#include <lib/utils.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <tools_share/firmware_image_package.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
/* IO devices */
|
||||
static const io_dev_connector_t *fip_dev_con;
|
||||
static uintptr_t fip_dev_handle;
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@
|
|||
#include <lib/psci/psci.h>
|
||||
#include <lib/mmio.h>
|
||||
#include <lib/utils.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
/*
|
||||
* DRAM1 is used also to load the NS boot loader. For this reason we
|
||||
|
|
|
|||
|
|
@ -11,10 +11,9 @@
|
|||
|
||||
#include <arch_helpers.h>
|
||||
#include <lib/psci/psci.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
/* Allow ARM Standard platforms to override these functions */
|
||||
#pragma weak plat_arm_program_trusted_mailbox
|
||||
|
||||
|
|
|
|||
|
|
@ -9,11 +9,10 @@
|
|||
#include <common/debug.h>
|
||||
#include <common/runtime_svc.h>
|
||||
#include <lib/pmf/pmf.h>
|
||||
#include <plat/arm/common/arm_sip_svc.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <tools_share/uuid.h>
|
||||
|
||||
#include <arm_sip_svc.h>
|
||||
#include <plat_arm.h>
|
||||
|
||||
/* ARM SiP Service UUID */
|
||||
DEFINE_SVC_UUID2(arm_sip_svc_uid,
|
||||
0x556d75e2, 0x6033, 0xb54b, 0xb5, 0x75,
|
||||
|
|
|
|||
|
|
@ -7,8 +7,7 @@
|
|||
#include <platform_def.h>
|
||||
|
||||
#include <arch.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
/*******************************************************************************
|
||||
* This function validates an MPIDR by checking whether it falls within the
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@
|
|||
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/tzc400.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
/* Weak definitions may be overridden in specific ARM standard platform */
|
||||
#pragma weak plat_arm_security_setup
|
||||
|
|
|
|||
|
|
@ -10,8 +10,7 @@
|
|||
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/tzc_dmc500.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
/*******************************************************************************
|
||||
* Initialize the DMC500-TrustZone Controller for ARM standard platforms.
|
||||
|
|
|
|||
|
|
@ -12,11 +12,10 @@
|
|||
#include <lib/el3_runtime/context_mgmt.h>
|
||||
#include <lib/psci/psci.h>
|
||||
#include <lib/utils.h>
|
||||
#include <plat/arm/common/arm_sip_svc.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <smccc_helpers.h>
|
||||
|
||||
#include <arm_sip_svc.h>
|
||||
#include <plat_arm.h>
|
||||
|
||||
/*
|
||||
* Handle SMC from a lower exception level to switch its execution state
|
||||
* (either from AArch64 to AArch32, or vice versa).
|
||||
|
|
|
|||
|
|
@ -14,10 +14,9 @@
|
|||
#include <drivers/arm/pl011.h>
|
||||
#include <drivers/console.h>
|
||||
#include <lib/mmio.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
static entry_point_info_t bl33_image_ep_info;
|
||||
|
||||
/* Weak definitions may be overridden in specific ARM standard platform */
|
||||
|
|
|
|||
|
|
@ -13,8 +13,7 @@
|
|||
#include <common/debug.h>
|
||||
#include <drivers/arm/pl011.h>
|
||||
#include <drivers/console.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
#define BL32_END (unsigned long)(&__BL32_END__)
|
||||
|
||||
|
|
|
|||
|
|
@ -6,11 +6,10 @@
|
|||
|
||||
#include <common/bl_common.h>
|
||||
#include <common/debug.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/arm/soc/common/soc_css.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <soc_css.h>
|
||||
|
||||
void bl1_platform_setup(void)
|
||||
{
|
||||
arm_bl1_platform_setup();
|
||||
|
|
|
|||
|
|
@ -8,14 +8,12 @@
|
|||
|
||||
#include <common/bl_common.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/css/css_scp.h>
|
||||
#include <lib/mmio.h>
|
||||
#include <lib/utils.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <platform_def.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
#include "../drivers/scp/css_scp.h"
|
||||
|
||||
/* Weak definition may be overridden in specific CSS based platform */
|
||||
#pragma weak plat_arm_bl2_handle_scp_bl2
|
||||
|
||||
|
|
|
|||
|
|
@ -6,12 +6,10 @@
|
|||
|
||||
#include <common/bl_common.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/css/css_scp.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
#include "../drivers/scp/css_scp.h"
|
||||
|
||||
/* Weak definition may be overridden in specific CSS based platform */
|
||||
#pragma weak bl2u_plat_handle_scp_bl2u
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,7 @@ CSS_LOAD_SCP_IMAGES ?= 1
|
|||
# By default, SCMI driver is disabled for CSS platforms
|
||||
CSS_USE_SCMI_SDS_DRIVER ?= 0
|
||||
|
||||
PLAT_INCLUDES += -Iinclude/plat/arm/css/common \
|
||||
-Iinclude/plat/arm/css/common/aarch64
|
||||
PLAT_INCLUDES += -Iinclude/plat/arm/css/common/aarch64
|
||||
|
||||
|
||||
PLAT_BL_COMMON_SOURCES += plat/arm/css/common/${ARCH}/css_helpers.S
|
||||
|
|
@ -27,16 +26,16 @@ BL31_SOURCES += plat/arm/css/common/css_pm.c \
|
|||
plat/arm/css/common/css_topology.c
|
||||
|
||||
ifeq (${CSS_USE_SCMI_SDS_DRIVER},0)
|
||||
BL31_SOURCES += plat/arm/css/drivers/scp/css_pm_scpi.c \
|
||||
plat/arm/css/drivers/mhu/css_mhu.c \
|
||||
plat/arm/css/drivers/scpi/css_scpi.c
|
||||
BL31_SOURCES += drivers/arm/css/mhu/css_mhu.c \
|
||||
drivers/arm/css/scp/css_pm_scpi.c \
|
||||
drivers/arm/css/scpi/css_scpi.c
|
||||
else
|
||||
BL31_SOURCES += plat/arm/css/drivers/scp/css_pm_scmi.c \
|
||||
plat/arm/css/drivers/scmi/scmi_ap_core_proto.c \
|
||||
plat/arm/css/drivers/scmi/scmi_common.c \
|
||||
plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c \
|
||||
plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c \
|
||||
plat/arm/css/drivers/mhu/css_mhu_doorbell.c
|
||||
BL31_SOURCES += drivers/arm/css/mhu/css_mhu_doorbell.c \
|
||||
drivers/arm/css/scmi/scmi_ap_core_proto.c \
|
||||
drivers/arm/css/scmi/scmi_common.c \
|
||||
drivers/arm/css/scmi/scmi_pwr_dmn_proto.c \
|
||||
drivers/arm/css/scmi/scmi_sys_pwr_proto.c \
|
||||
drivers/arm/css/scp/css_pm_scmi.c
|
||||
endif
|
||||
|
||||
# Process CSS_LOAD_SCP_IMAGES flag
|
||||
|
|
@ -50,19 +49,19 @@ ifeq (${CSS_LOAD_SCP_IMAGES},1)
|
|||
endif
|
||||
|
||||
ifeq (${CSS_USE_SCMI_SDS_DRIVER},1)
|
||||
BL2U_SOURCES += plat/arm/css/drivers/scp/css_sds.c \
|
||||
plat/arm/css/drivers/sds/sds.c
|
||||
BL2U_SOURCES += drivers/arm/css/scp/css_sds.c \
|
||||
drivers/arm/css/sds/sds.c
|
||||
|
||||
BL2_SOURCES += plat/arm/css/drivers/scp/css_sds.c \
|
||||
plat/arm/css/drivers/sds/sds.c
|
||||
BL2_SOURCES += drivers/arm/css/scp/css_sds.c \
|
||||
drivers/arm/css/sds/sds.c
|
||||
else
|
||||
BL2U_SOURCES += plat/arm/css/drivers/scp/css_bom_bootloader.c \
|
||||
plat/arm/css/drivers/mhu/css_mhu.c \
|
||||
plat/arm/css/drivers/scpi/css_scpi.c
|
||||
BL2U_SOURCES += drivers/arm/css/mhu/css_mhu.c \
|
||||
drivers/arm/css/scp/css_bom_bootloader.c \
|
||||
drivers/arm/css/scpi/css_scpi.c
|
||||
|
||||
BL2_SOURCES += plat/arm/css/drivers/scp/css_bom_bootloader.c \
|
||||
plat/arm/css/drivers/mhu/css_mhu.c \
|
||||
plat/arm/css/drivers/scpi/css_scpi.c
|
||||
BL2_SOURCES += drivers/arm/css/mhu/css_mhu.c \
|
||||
drivers/arm/css/scp/css_bom_bootloader.c \
|
||||
drivers/arm/css/scpi/css_scpi.c
|
||||
# Enable option to detect whether the SCP ROM firmware in use predates version
|
||||
# 1.7.0 and therefore, is incompatible.
|
||||
CSS_DETECT_PRE_1_7_0_SCP := 1
|
||||
|
|
@ -74,7 +73,7 @@ ifeq (${CSS_LOAD_SCP_IMAGES},1)
|
|||
endif
|
||||
|
||||
ifeq (${CSS_USE_SCMI_SDS_DRIVER},1)
|
||||
PLAT_BL_COMMON_SOURCES += plat/arm/css/drivers/sds/${ARCH}/sds_helpers.S
|
||||
PLAT_BL_COMMON_SOURCES += drivers/arm/css/sds/${ARCH}/sds_helpers.S
|
||||
endif
|
||||
|
||||
# Process CSS_USE_SCMI_SDS_DRIVER flag
|
||||
|
|
|
|||
|
|
@ -11,14 +11,12 @@
|
|||
|
||||
#include <arch_helpers.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/css/css_scp.h>
|
||||
#include <lib/cassert.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/arm/css/common/css_pm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <css_pm.h>
|
||||
#include <plat_arm.h>
|
||||
|
||||
#include "../drivers/scp/css_scp.h"
|
||||
|
||||
/* Allow CSS platforms to override `plat_arm_psci_pm_ops` */
|
||||
#pragma weak plat_arm_psci_pm_ops
|
||||
|
||||
|
|
|
|||
|
|
@ -6,10 +6,9 @@
|
|||
|
||||
#include <assert.h>
|
||||
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
#if ARM_PLAT_MT
|
||||
#pragma weak plat_arm_get_cpu_pe_count
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@ BL32_SOURCES += plat/arm/css/common/css_pm.c \
|
|||
plat/arm/css/common/css_topology.c
|
||||
|
||||
ifeq (${CSS_USE_SCMI_SDS_DRIVER},0)
|
||||
BL32_SOURCES += plat/arm/css/drivers/scp/css_pm_scpi.c \
|
||||
plat/arm/css/drivers/mhu/css_mhu.c \
|
||||
plat/arm/css/drivers/scpi/css_scpi.c
|
||||
BL32_SOURCES += drivers/arm/css/mhu/css_mhu.c \
|
||||
drivers/arm/css/scp/css_pm_scpi.c \
|
||||
drivers/arm/css/scpi/css_scpi.c
|
||||
else
|
||||
BL32_SOURCES += plat/arm/css/drivers/scp/css_pm_scmi.c \
|
||||
plat/arm/css/drivers/scmi/scmi_common.c \
|
||||
plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c \
|
||||
plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c \
|
||||
plat/arm/css/drivers/mhu/css_mhu_doorbell.c
|
||||
BL32_SOURCES += drivers/arm/css/mhu/css_mhu_doorbell.c \
|
||||
drivers/arm/css/scp/css_pm_scmi.c \
|
||||
drivers/arm/css/scmi/scmi_common.c \
|
||||
drivers/arm/css/scmi/scmi_pwr_dmn_proto.c \
|
||||
drivers/arm/css/scmi/scmi_sys_pwr_proto.c
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -9,15 +9,14 @@
|
|||
|
||||
#include <lib/utils_def.h>
|
||||
#include <lib/xlat_tables/xlat_tables_defs.h>
|
||||
#include <plat/arm/board/common/board_css_def.h>
|
||||
#include <plat/arm/board/common/v2m_def.h>
|
||||
#include <plat/arm/common/arm_def.h>
|
||||
#include <plat/arm/common/arm_spm_def.h>
|
||||
#include <plat/arm/css/common/css_def.h>
|
||||
#include <plat/arm/soc/common/soc_css_def.h>
|
||||
#include <plat/common/common_def.h>
|
||||
|
||||
#include <arm_def.h>
|
||||
#include <arm_spm_def.h>
|
||||
#include <board_css_def.h>
|
||||
#include <css_def.h>
|
||||
#include <soc_css_def.h>
|
||||
#include <v2m_def.h>
|
||||
|
||||
#define PLATFORM_CORE_COUNT (PLAT_ARM_CLUSTER_COUNT * \
|
||||
CSS_SGI_MAX_CPUS_PER_CLUSTER * \
|
||||
CSS_SGI_MAX_PE_PER_CPU)
|
||||
|
|
|
|||
|
|
@ -10,14 +10,13 @@
|
|||
|
||||
#include <common/bl_common.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/css/css_mhu_doorbell.h>
|
||||
#include <drivers/arm/css/scmi.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <sgi_ras.h>
|
||||
#include <sgi_variant.h>
|
||||
|
||||
#include "../../css/drivers/scmi/scmi.h"
|
||||
#include "../../css/drivers/mhu/css_mhu_doorbell.h"
|
||||
|
||||
sgi_platform_info_t sgi_plat_info;
|
||||
|
||||
static scmi_channel_plat_info_t sgi575_scmi_plat_info = {
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@
|
|||
#include <arch_helpers.h>
|
||||
#include <common/debug.h>
|
||||
#include <common/desc_image_load.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <sgi_variant.h>
|
||||
|
||||
/*******************************************************************************
|
||||
|
|
|
|||
|
|
@ -11,11 +11,10 @@
|
|||
#include <common/bl_common.h>
|
||||
#include <common/debug.h>
|
||||
#include <drivers/arm/ccn.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <services/secure_partition.h>
|
||||
|
||||
#include <plat_arm.h>
|
||||
|
||||
#if USE_COHERENT_MEM
|
||||
/*
|
||||
* The next 2 constants identify the extents of the coherent memory region.
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
#include <bl31/interrupt_mgmt.h>
|
||||
#include <lib/el3_runtime/context_mgmt.h>
|
||||
#include <lib/extensions/ras.h>
|
||||
#include <plat/arm/common/arm_spm_def.h>
|
||||
#include <plat/common/platform.h>
|
||||
#include <services/mm_svc.h>
|
||||
#include <services/sdei.h>
|
||||
#include <services/spm_svc.h>
|
||||
|
||||
#include <arm_spm_def.h>
|
||||
#include <sgi_ras.h>
|
||||
|
||||
static int sgi_ras_intr_handler(const struct err_record_info *err_rec,
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <plat_arm.h>
|
||||
#include <plat/arm/common/plat_arm.h>
|
||||
|
||||
#include <sgi_variant.h>
|
||||
|
||||
/* Topology */
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue