diff options
| author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-03-12 15:54:28 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-03-12 15:54:28 +0000 |
| commit | d2737fe1c60c9a3a60510855d0f726e70a7ccb5b (patch) | |
| tree | 0dd14d2a2ee294f6d8ba86ccaaeaf90053fd01b9 /include | |
| parent | 8fd41bb973c472d188f7030d4a742ac514bff10e (diff) | |
| parent | 6138ffbc12f840c44cb214d9d04270c7badc87f9 (diff) | |
| download | platform_external_arm-trusted-firmware-d2737fe1c60c9a3a60510855d0f726e70a7ccb5b.tar.gz platform_external_arm-trusted-firmware-d2737fe1c60c9a3a60510855d0f726e70a7ccb5b.tar.bz2 platform_external_arm-trusted-firmware-d2737fe1c60c9a3a60510855d0f726e70a7ccb5b.zip | |
Merge changes from topic "mp/enhanced_pal_hw" into integration
* changes:
plat/arm/fvp: populate pwr domain descriptor dynamically
fconf: Extract topology node properties from HW_CONFIG dtb
fconf: necessary modifications to support fconf in BL31 & SP_MIN
fconf: enhancements to firmware configuration framework
Diffstat (limited to 'include')
| -rw-r--r-- | include/lib/fconf/fconf.h | 12 | ||||
| -rw-r--r-- | include/plat/arm/common/plat_arm.h | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/include/lib/fconf/fconf.h b/include/lib/fconf/fconf.h index 0401e5c06..09d2b59aa 100644 --- a/include/lib/fconf/fconf.h +++ b/include/lib/fconf/fconf.h @@ -12,9 +12,16 @@ /* Public API */ #define FCONF_GET_PROPERTY(a, b, c) a##__##b##_getter(c) -#define FCONF_REGISTER_POPULATOR(name, callback) \ +/* + * This macro takes three arguments: + * config: Configuration identifier + * name: property namespace + * callback: populate() function + */ +#define FCONF_REGISTER_POPULATOR(config, name, callback) \ __attribute__((used, section(".fconf_populator"))) \ const struct fconf_populator (name##__populator) = { \ + .config_type = (#config), \ .info = (#name), \ .populate = (callback) \ }; @@ -27,6 +34,7 @@ */ struct fconf_populator { /* Description of the data loaded by the callback */ + const char *config_type; const char *info; /* Callback used by fconf_populate function with a provided config dtb. @@ -45,7 +53,7 @@ void fconf_load_config(void); * * Panic on error. */ -void fconf_populate(uintptr_t config); +void fconf_populate(const char *config_type, uintptr_t config); /* FCONF specific getter */ #define fconf__dtb_getter(prop) fconf_dtb_info.prop diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index babde41fe..6c2925afa 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -222,6 +222,7 @@ void arm_tsp_early_platform_setup(void); void arm_sp_min_early_platform_setup(void *from_bl2, uintptr_t tos_fw_config, uintptr_t hw_config, void *plat_params_from_bl2); void arm_sp_min_plat_runtime_setup(void); +void arm_sp_min_plat_arch_setup(void); /* FIP TOC validity check */ bool arm_io_is_toc_valid(void); |