Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-21 20:14:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(rdn2): populate TOS_CONFIG only when SPMC_AT_EL3 is enabled

Browse source 
As of now, TOS_FW_CONFIG (trusted OS config) gets populated by default
for RD-N2. However, TOS_FW_CONFIG is required only when SPMC_AT_EL3 is
enabled. As the platform should support SPMC_AT_EL3 disabled mode as
well, populate TOS_CONFIG only when SPMC_AT_EL3 is enabled.
Additionally, building of rdn2_stmm_sel0_manifest.dtb is made
conditional to align with this configuration.

Signed-off-by: Rohit Mathew <Rohit.Mathew@arm.com>
Change-Id: I9077d44b21d32ba7bf6b3b1c539662c14785ca6b
This commit is contained in:
Rohit Mathew 2024-02-12 18:54:15 +00:00 • committed by Omkar Anand Kulkarni
parent 89d857780c
commit 10dcffedb3
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plat/arm/board/rdn2/fdts/rdn2_fw_config.dts
View file

@ -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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -18,12 +18,14 @@
id = <TB_FW_CONFIG_ID>; id = <TB_FW_CONFIG_ID>;
}; };
#if SPMC_AT_EL3
tos_fw-config { tos_fw-config {
load-address = <0x0 0x04001500>; load-address = <0x0 0x04001500>;
max-size = <0x1000>; max-size = <0x1000>;
id = <TOS_FW_CONFIG_ID>; id = <TOS_FW_CONFIG_ID>;
}; };
#endif
nt_fw-config { nt_fw-config {
load-address = <0x0 0xFEF00000>; load-address = <0x0 0xFEF00000>;
max-size = <0x0100000>; max-size = <0x0100000>;

4
plat/arm/board/rdn2/platform.mk
View file

@ -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 # 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 # Add the NT_FW_CONFIG to FIP and specify the same to certtool
$(eval $(call TOOL_ADD_PAYLOAD,${NT_FW_CONFIG},--nt-fw-config)) $(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 STMM_CONFIG_DTS := ${RDN2_BASE}/fdts/${PLAT}_stmm_sel0_manifest.dts
FDT_SOURCES += ${STMM_CONFIG_DTS} FDT_SOURCES += ${STMM_CONFIG_DTS}
TOS_FW_CONFIG := ${BUILD_PLAT}/fdts/$(notdir $(basename ${STMM_CONFIG_DTS})).dtb 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 # 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})) $(eval $(call TOOL_ADD_PAYLOAD,${TOS_FW_CONFIG},--tos-fw-config,${TOS_FW_CONFIG}))
endif
override CTX_INCLUDE_AARCH32_REGS := 0 override CTX_INCLUDE_AARCH32_REGS := 0
override ENABLE_FEAT_AMU := 1 override ENABLE_FEAT_AMU := 1