diff options
author | Louis Mayencourt <louis.mayencourt@arm.com> | 2019-10-17 15:14:25 +0100 |
---|---|---|
committer | Louis Mayencourt <louis.mayencourt@arm.com> | 2020-02-07 13:51:31 +0000 |
commit | 9814bfc1bfc4868a8505d3756aceea5ad41a8c64 (patch) | |
tree | 57ea00023b87eefc1b8f7a24cdfb9d0c95f12a90 /plat/arm/common/arm_bl2_setup.c | |
parent | 3b5ea741fd92088c9e005d3508b73e50f1d5daf7 (diff) | |
download | trusted-firmware-a-9814bfc1bfc4868a8505d3756aceea5ad41a8c64.tar.gz |
fconf: Populate properties from dtb during bl2 setup
Use the dtb provided by bl1 as configuration file for fconf.
Change-Id: I3f466ad9b7047e1a361d94e71ac6d693e31496d9
Signed-off-by: Louis Mayencourt <louis.mayencourt@arm.com>
Diffstat (limited to 'plat/arm/common/arm_bl2_setup.c')
-rw-r--r-- | plat/arm/common/arm_bl2_setup.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/plat/arm/common/arm_bl2_setup.c b/plat/arm/common/arm_bl2_setup.c index cdf87ca552..5f83bccde7 100644 --- a/plat/arm/common/arm_bl2_setup.c +++ b/plat/arm/common/arm_bl2_setup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -14,6 +14,7 @@ #include <common/debug.h> #include <common/desc_image_load.h> #include <drivers/generic_delay_timer.h> +#include <lib/fconf/fconf.h> #ifdef SPD_opteed #include <lib/optee_utils.h> #endif @@ -58,11 +59,13 @@ void arm_bl2_early_platform_setup(uintptr_t tb_fw_config, /* Setup the BL2 memory layout */ bl2_tzram_layout = *mem_layout; + /* Fill the properties struct with the info from the config dtb */ + if (tb_fw_config != 0U) { + fconf_populate(tb_fw_config); + } + /* Initialise the IO layer and register platform IO devices */ plat_arm_io_setup(); - - if (tb_fw_config != 0U) - arm_bl2_set_tb_cfg_addr((void *)tb_fw_config); } void bl2_early_platform_setup2(u_register_t arg0, u_register_t arg1, u_register_t arg2, u_register_t arg3) |