From be79071ef73b4b08cca310ec7e7d915faea8f036 Mon Sep 17 00:00:00 2001 From: Patrik Berglund Date: Wed, 14 Sep 2022 17:22:15 +0100 Subject: [PATCH] feat(morello): add support for HW_CONFIG This patch add support to load HW_CONFIG in BL2 and pass it to bootloader stages BL31 and BL33. Signed-off-by: Patrik Berglund Change-Id: I646fabed83dbca5322a59a399de5194cfef474ad --- plat/arm/board/morello/fdts/morello_fw_config.dts | 10 ++++++++-- plat/arm/board/morello/platform.mk | 5 ++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/plat/arm/board/morello/fdts/morello_fw_config.dts b/plat/arm/board/morello/fdts/morello_fw_config.dts index c47bae5a9..a63d7eb1c 100644 --- a/plat/arm/board/morello/fdts/morello_fw_config.dts +++ b/plat/arm/board/morello/fdts/morello_fw_config.dts @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, Arm Limited. All rights reserved. + * Copyright (c) 2021-2023, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -19,8 +19,14 @@ nt_fw-config { load-address = <0x0 0xFEF00000>; - max-size = <0x0100000>; + max-size = <0xF8000>; id = ; }; + + hw-config { + load-address = <0x0 0xFEFF8000>; + max-size = <0x8000>; + id = ; + }; }; }; diff --git a/plat/arm/board/morello/platform.mk b/plat/arm/board/morello/platform.mk index 156b7ea2c..0f0cabbad 100644 --- a/plat/arm/board/morello/platform.mk +++ b/plat/arm/board/morello/platform.mk @@ -1,5 +1,5 @@ # -# Copyright (c) 2020-2022, Arm Limited. All rights reserved. +# Copyright (c) 2020-2023, Arm Limited. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -59,11 +59,14 @@ FDT_SOURCES += fdts/morello-${TARGET_PLATFORM}.dts \ ${MORELLO_BASE}/fdts/morello_nt_fw_config.dts FW_CONFIG := ${BUILD_PLAT}/fdts/morello_fw_config.dtb +HW_CONFIG := ${BUILD_PLAT}/fdts/morello-${TARGET_PLATFORM}.dtb TB_FW_CONFIG := ${BUILD_PLAT}/fdts/morello_tb_fw_config.dtb NT_FW_CONFIG := ${BUILD_PLAT}/fdts/morello_nt_fw_config.dtb # Add the FW_CONFIG to FIP and specify the same to certtool $(eval $(call TOOL_ADD_PAYLOAD,${FW_CONFIG},--fw-config,${FW_CONFIG})) +# Add the HW_CONFIG to FIP and specify the same to certtool +$(eval $(call TOOL_ADD_PAYLOAD,${HW_CONFIG},--hw-config,${HW_CONFIG})) # Add the TB_FW_CONFIG to FIP and specify the same to certtool $(eval $(call TOOL_ADD_PAYLOAD,${TB_FW_CONFIG},--tb-fw-config,${TB_FW_CONFIG})) # Add the NT_FW_CONFIG to FIP and specify the same to certtool -- 2.39.5