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 <patrik.berglund@arm.com>
Change-Id: I646fabed83dbca5322a59a399de5194cfef474ad

diff --git a/plat/arm/board/morello/fdts/morello_fw_config.dts b/plat/arm/board/morello/fdts/morello_fw_config.dts
index c47bae5a9427e09b1d2d0294c01c3353d14a6513..a63d7eb1cec0ef169217ef8d8a60ff7243d0e8ad 100644 (file)
--- 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 = <NT_FW_CONFIG_ID>;
                };
+
+               hw-config {
+                       load-address = <0x0 0xFEFF8000>;
+                       max-size = <0x8000>;
+                       id = <HW_CONFIG_ID>;
+               };
        };
 };

diff --git a/plat/arm/board/morello/platform.mk b/plat/arm/board/morello/platform.mk
index 156b7ea2c1844e4cccec7867d324a261d2c24869..0f0cabbad8df6354d72997f87a0a4df2173080fc 100644 (file)
--- 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