refactor(fvp): rename the DTB info structure member

In line with the previous patch, the name of the member of the
hw_config DTB info structure has been renamed.

Change-Id: I6689e416fecd66faa515e820f1c4b23bcb65bfb1
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>

diff --git a/plat/arm/board/fvp/fdts/fvp_fw_config.dts b/plat/arm/board/fvp/fdts/fvp_fw_config.dts
index 577ac749c7b3ebc9f6d022b961ed67639aa659ca..4c8bf3fb060884c24b6779c5460cce3cf3a9e98a 100644 (file)
--- a/plat/arm/board/fvp/fdts/fvp_fw_config.dts
+++ b/plat/arm/board/fvp/fdts/fvp_fw_config.dts
@@ -22,7 +22,7 @@
                        load-address = <0x0 0x07f00000>;
                        max-size = <0x00100000>;
                        id = <HW_CONFIG_ID>;
-                       ns-load-address = <0x0 0x82000000>;
+                       secondary-load-address = <0x0 0x82000000>;
                };
 
                /*

diff --git a/plat/arm/board/fvp/fvp_bl2_setup.c b/plat/arm/board/fvp/fvp_bl2_setup.c
index 74e5d72f7321ae2d8c1abd1c224780f0267b6baf..4c71d816f0bafe958f9b55ec82990f2c5ced11e5 100644 (file)
--- a/plat/arm/board/fvp/fvp_bl2_setup.c
+++ b/plat/arm/board/fvp/fvp_bl2_setup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2022, Arm Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2023, Arm Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -82,7 +82,7 @@ struct bl_params *plat_get_next_bl_params(void)
        assert(param_node != NULL);
 
        /* Copy HW config from Secure address to NS address */
-       memcpy((void *)hw_config_info->ns_config_addr,
+       memcpy((void *)hw_config_info->secondary_config_addr,
               (void *)hw_config_info->config_addr,
               (size_t)param_node->image_info.image_size);
 
@@ -91,14 +91,14 @@ struct bl_params *plat_get_next_bl_params(void)
         * a possibility to use HW-config without cache and MMU enabled
         * at BL33
         */
-       flush_dcache_range(hw_config_info->ns_config_addr,
+       flush_dcache_range(hw_config_info->secondary_config_addr,
                           param_node->image_info.image_size);
 
        param_node = get_bl_mem_params_node(BL33_IMAGE_ID);
        assert(param_node != NULL);
 
        /* Update BL33's ep info with NS HW config address  */
-       param_node->ep_info.args.arg1 = hw_config_info->ns_config_addr;
+       param_node->ep_info.args.arg1 = hw_config_info->secondary_config_addr;
 #endif /* !BL2_AT_EL3 && !EL3_PAYLOAD_BASE */
 
        return arm_bl_params;

diff --git a/plat/arm/board/fvp/fvp_bl31_setup.c b/plat/arm/board/fvp/fvp_bl31_setup.c
index dd9096543ff3d626a102ce44f0387e46055b3b18..57865eb86fb70d4a04953f7cbb9d3c08fd791206 100644 (file)
--- a/plat/arm/board/fvp/fvp_bl31_setup.c
+++ b/plat/arm/board/fvp/fvp_bl31_setup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2022, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2023, Arm Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -45,8 +45,8 @@ void __init bl31_early_platform_setup2(u_register_t arg0,
         */
        hw_config_info = FCONF_GET_PROPERTY(dyn_cfg, dtb, HW_CONFIG_ID);
        assert(hw_config_info != NULL);
-       assert(hw_config_info->ns_config_addr != 0UL);
-       arg2 = hw_config_info->ns_config_addr;
+       assert(hw_config_info->secondary_config_addr != 0UL);
+       arg2 = hw_config_info->secondary_config_addr;
 #endif /* !RESET_TO_BL31 && !BL2_AT_EL3 */
 
        arm_bl31_early_platform_setup((void *)arg0, arg1, arg2, (void *)arg3);