diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2023-02-10 10:05:12 +0100 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-02-10 10:05:12 +0100 |
| commit | af4fee04b9e0fcbf7e5a1f9ff2e88278fc99f865 (patch) | |
| tree | daf8e7356e3c1ee9d89ba1dc501cbc37ceab539a /include/lib | |
| parent | 493de4df53fca313a62408e1f9be235e6e7bcfbb (diff) | |
| parent | 8c829a9240109dd7a66a3c26f734f23477b12551 (diff) | |
| download | arm-trusted-firmware-af4fee04b9e0fcbf7e5a1f9ff2e88278fc99f865.tar.gz | |
Merge changes from topic "mb/tos-fw-config-load-refactor" into integration
* changes:
feat(spmd): map SPMC manifest region as EL3_PAS
feat(fvp): update device tree with load addresses of TOS_FW config
refactor(fvp): rename the DTB info structure member
feat(fconf): rename 'ns-load-address' to 'secondary-load-address'
Diffstat (limited to 'include/lib')
| -rw-r--r-- | include/lib/fconf/fconf_dyn_cfg_getter.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/lib/fconf/fconf_dyn_cfg_getter.h b/include/lib/fconf/fconf_dyn_cfg_getter.h index 43f298eb9..35546734d 100644 --- a/include/lib/fconf/fconf_dyn_cfg_getter.h +++ b/include/lib/fconf/fconf_dyn_cfg_getter.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-2022, Arm Limited. All rights reserved. + * Copyright (c) 2019-2023, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -19,12 +19,11 @@ struct dyn_cfg_dtb_info_t { uint32_t config_max_size; unsigned int config_id; /* - * Load address in non-secure memory. Only needed by those - * configuration files which require being loaded in secure - * memory (at config_addr) as well as in non-secure memory + * A platform uses this address to copy the configuration + * to another location during the boot-flow. * - e.g. HW_CONFIG */ - uintptr_t ns_config_addr; + uintptr_t secondary_config_addr; }; unsigned int dyn_cfg_dtb_info_get_index(unsigned int config_id); @@ -32,7 +31,7 @@ struct dyn_cfg_dtb_info_t *dyn_cfg_dtb_info_getter(unsigned int config_id); int fconf_populate_dtb_registry(uintptr_t config); /* Set config information in global DTB array */ -void set_config_info(uintptr_t config_addr, uintptr_t ns_config_addr, +void set_config_info(uintptr_t config_addr, uintptr_t secondary_config_addr, uint32_t config_max_size, unsigned int config_id); |