diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2020-05-05 12:01:48 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-05-05 12:01:48 +0000 |
| commit | 6eb4304cf539c30c8d766fb5f57f3374f888d4f4 (patch) | |
| tree | ae33bf5f727c6dd2db036f74e21d52d637f81f53 /lib/fconf | |
| parent | 659bf156f15a334670d56bc6d0022706d1711b58 (diff) | |
| parent | 592c396dcf4614b5e109fa182c71f70302d85935 (diff) | |
| download | arm-trusted-firmware-6eb4304cf539c30c8d766fb5f57f3374f888d4f4.tar.gz | |
Merge changes I85eb75cf,Ic6d9f927 into integration
* changes:
fconf: Update dyn_config compatible string
doc: Add binding document for fconf.
Diffstat (limited to 'lib/fconf')
| -rw-r--r-- | lib/fconf/fconf_dyn_cfg_getter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/fconf/fconf_dyn_cfg_getter.c b/lib/fconf/fconf_dyn_cfg_getter.c index 03aaf9bb6..7b5bd6ec9 100644 --- a/lib/fconf/fconf_dyn_cfg_getter.c +++ b/lib/fconf/fconf_dyn_cfg_getter.c @@ -48,8 +48,8 @@ int fconf_populate_dtb_registry(uintptr_t config) /* As libfdt use void *, we can't avoid this cast */ const void *dtb = (void *)config; - /* Find the node offset point to "arm,dyn_cfg-dtb_registry" compatible property */ - const char *compatible_str = "arm,dyn_cfg-dtb_registry"; + /* Find the node offset point to "fconf,dyn_cfg-dtb_registry" compatible property */ + const char *compatible_str = "fconf,dyn_cfg-dtb_registry"; node = fdt_node_offset_by_compatible(dtb, -1, compatible_str); if (node < 0) { ERROR("FCONF: Can't find %s compatible in dtb\n", compatible_str); |