diff --git a/plat/arm/board/tc/include/platform_def.h b/plat/arm/board/tc/include/platform_def.h index 38413efc8..60c244bad 100644 --- a/plat/arm/board/tc/include/platform_def.h +++ b/plat/arm/board/tc/include/platform_def.h @@ -333,6 +333,7 @@ */ #define PLAT_CSS_MAX_SCP_BL2U_SIZE 0x20000 +#if TARGET_PLATFORM <= 2 /* TZC Related Constants */ #define PLAT_ARM_TZC_BASE UL(0x25000000) #define PLAT_ARM_TZC_FILTERS TZC_400_REGION_ATTR_FILTER_BIT(0) @@ -360,6 +361,7 @@ PLAT_ARM_TZC_NS_DEV_ACCESS}, \ {PLAT_ARM_DRAM2_BASE, PLAT_ARM_DRAM2_END, \ ARM_TZC_NS_DRAM_S_ACCESS, PLAT_ARM_TZC_NS_DEV_ACCESS} +#endif /* virtual address used by dynamic mem_protect for chunk_base */ #define PLAT_ARM_MEM_PROTEC_VA_FRAME UL(0xc0000000) diff --git a/plat/arm/board/tc/platform.mk b/plat/arm/board/tc/platform.mk index 28b98c281..b76917ba8 100644 --- a/plat/arm/board/tc/platform.mk +++ b/plat/arm/board/tc/platform.mk @@ -138,9 +138,12 @@ BL2_SOURCES += ${TC_BASE}/tc_security.c \ ${TC_BASE}/tc_bl2_setup.c \ lib/utils/mem_region.c \ drivers/arm/tzc/tzc400.c \ - plat/arm/common/arm_tzc400.c \ plat/arm/common/arm_nor_psci_mem_protect.c +ifeq ($(shell test $(TARGET_PLATFORM) -le 2; echo $$?),0) +BL2_SOURCES += plat/arm/common/arm_tzc400.c +endif + BL31_SOURCES += ${INTERCONNECT_SOURCES} \ ${TC_CPU_SOURCES} \ ${ENT_GIC_SOURCES} \ diff --git a/plat/arm/board/tc/tc_security.c b/plat/arm/board/tc/tc_security.c index 6a345010a..7c7a1a13c 100644 --- a/plat/arm/board/tc/tc_security.c +++ b/plat/arm/board/tc/tc_security.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Arm Limited. All rights reserved. + * Copyright (c) 2024, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,17 +7,21 @@ #include #include +#if (TARGET_PLATFORM <= 2) static const arm_tzc_regions_info_t tzc_regions[] = { TC_TZC_REGIONS_DEF, {} }; +#endif /* Initialize the secure environment */ void plat_arm_security_setup(void) { +#if (TARGET_PLATFORM <= 2) unsigned int i; for (i = 0U; i < TZC400_COUNT; i++) { arm_tzc400_setup(TZC400_BASE(i), tzc_regions); } +#endif }