diff --git a/plat/arm/board/rdn2/fdts/rdn2_fw_config.dts b/plat/arm/board/rdn2/fdts/rdn2_fw_config.dts index d992eac14..f857f72ac 100644 --- a/plat/arm/board/rdn2/fdts/rdn2_fw_config.dts +++ b/plat/arm/board/rdn2/fdts/rdn2_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -18,12 +18,14 @@ id = ; }; +#if SPMC_AT_EL3 tos_fw-config { load-address = <0x0 0x04001500>; max-size = <0x1000>; id = ; }; +#endif nt_fw-config { load-address = <0x0 0xFEF00000>; max-size = <0x0100000>; diff --git a/plat/arm/board/rdn2/platform.mk b/plat/arm/board/rdn2/platform.mk index 28ec5dc6e..30402a882 100644 --- a/plat/arm/board/rdn2/platform.mk +++ b/plat/arm/board/rdn2/platform.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2020-2023, Arm Limited and Contributors. All rights reserved. +# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -93,12 +93,14 @@ NT_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_nt_fw_config.dtb # Add the NT_FW_CONFIG to FIP and specify the same to certtool $(eval $(call TOOL_ADD_PAYLOAD,${NT_FW_CONFIG},--nt-fw-config)) +ifeq (${SPMC_AT_EL3}, 1) STMM_CONFIG_DTS := ${RDN2_BASE}/fdts/${PLAT}_stmm_sel0_manifest.dts FDT_SOURCES += ${STMM_CONFIG_DTS} TOS_FW_CONFIG := ${BUILD_PLAT}/fdts/$(notdir $(basename ${STMM_CONFIG_DTS})).dtb # Add the TOS_FW_CONFIG to FIP and specify the same to certtool $(eval $(call TOOL_ADD_PAYLOAD,${TOS_FW_CONFIG},--tos-fw-config,${TOS_FW_CONFIG})) +endif override CTX_INCLUDE_AARCH32_REGS := 0 override ENABLE_FEAT_AMU := 1