From 592c396dcf4614b5e109fa182c71f70302d85935 Mon Sep 17 00:00:00 2001 From: Louis Mayencourt Date: Mon, 20 Apr 2020 14:17:21 +0100 Subject: [PATCH] fconf: Update dyn_config compatible string Dynamic configuration properties are fconf properties. Modify the compatible string from "arm,.." to "fconf,.." to reflect this. Signed-off-by: Louis Mayencourt Change-Id: I85eb75cf877c5f4d3feea3936d4c348ca843bc6c --- lib/fconf/fconf_dyn_cfg_getter.c | 4 ++-- plat/arm/board/a5ds/fdts/a5ds_fw_config.dts | 2 +- plat/arm/board/fvp/fdts/fvp_fw_config.dts | 2 +- plat/arm/board/fvp_ve/fdts/fvp_ve_fw_config.dts | 2 +- plat/arm/board/juno/fdts/juno_fw_config.dts | 2 +- plat/arm/board/rddaniel/fdts/rddaniel_fw_config.dts | 2 +- plat/arm/board/rddanielxlr/fdts/rddanielxlr_fw_config.dts | 2 +- plat/arm/board/rde1edge/fdts/rde1edge_fw_config.dts | 2 +- plat/arm/board/rdn1edge/fdts/rdn1edge_fw_config.dts | 2 +- plat/arm/board/sgi575/fdts/sgi575_fw_config.dts | 2 +- plat/arm/board/sgm775/fdts/sgm775_fw_config.dts | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/fconf/fconf_dyn_cfg_getter.c b/lib/fconf/fconf_dyn_cfg_getter.c index 317d3e5d3..56e0c4ae7 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); diff --git a/plat/arm/board/a5ds/fdts/a5ds_fw_config.dts b/plat/arm/board/a5ds/fdts/a5ds_fw_config.dts index 2f2d265c5..ff079ab6f 100644 --- a/plat/arm/board/a5ds/fdts/a5ds_fw_config.dts +++ b/plat/arm/board/a5ds/fdts/a5ds_fw_config.dts @@ -10,7 +10,7 @@ / { dtb-registry { - compatible = "arm,dyn_cfg-dtb_registry"; + compatible = "fconf,dyn_cfg-dtb_registry"; /* tb_fw_config is temporarily contained in this dtb */ tb_fw-config { diff --git a/plat/arm/board/fvp/fdts/fvp_fw_config.dts b/plat/arm/board/fvp/fdts/fvp_fw_config.dts index 98ea85760..7c111085d 100644 --- a/plat/arm/board/fvp/fdts/fvp_fw_config.dts +++ b/plat/arm/board/fvp/fdts/fvp_fw_config.dts @@ -10,7 +10,7 @@ / { dtb-registry { - compatible = "arm,dyn_cfg-dtb_registry"; + compatible = "fconf,dyn_cfg-dtb_registry"; /* tb_fw_config is temporarily contained on this dtb */ tb_fw-config { diff --git a/plat/arm/board/fvp_ve/fdts/fvp_ve_fw_config.dts b/plat/arm/board/fvp_ve/fdts/fvp_ve_fw_config.dts index 147c8f366..1727e2e24 100644 --- a/plat/arm/board/fvp_ve/fdts/fvp_ve_fw_config.dts +++ b/plat/arm/board/fvp_ve/fdts/fvp_ve_fw_config.dts @@ -10,7 +10,7 @@ / { dtb-registry { - compatible = "arm,dyn_cfg-dtb_registry"; + compatible = "fconf,dyn_cfg-dtb_registry"; /* tb_fw_config is temporarily contained on this dtb */ tb_fw-config { diff --git a/plat/arm/board/juno/fdts/juno_fw_config.dts b/plat/arm/board/juno/fdts/juno_fw_config.dts index cab6f2bf4..4e460aa78 100644 --- a/plat/arm/board/juno/fdts/juno_fw_config.dts +++ b/plat/arm/board/juno/fdts/juno_fw_config.dts @@ -10,7 +10,7 @@ / { dtb-registry { - compatible = "arm,dyn_cfg-dtb_registry"; + compatible = "fconf,dyn_cfg-dtb_registry"; /* tb_fw_config is temporarily contained on this dtb */ tb_fw-config { diff --git a/plat/arm/board/rddaniel/fdts/rddaniel_fw_config.dts b/plat/arm/board/rddaniel/fdts/rddaniel_fw_config.dts index 81e4cc12d..bb544a410 100644 --- a/plat/arm/board/rddaniel/fdts/rddaniel_fw_config.dts +++ b/plat/arm/board/rddaniel/fdts/rddaniel_fw_config.dts @@ -10,7 +10,7 @@ / { dtb-registry { - compatible = "arm,dyn_cfg-dtb_registry"; + compatible = "fconf,dyn_cfg-dtb_registry"; /* tb_fw_config is temporarily contained on this dtb */ tb_fw-config { diff --git a/plat/arm/board/rddanielxlr/fdts/rddanielxlr_fw_config.dts b/plat/arm/board/rddanielxlr/fdts/rddanielxlr_fw_config.dts index 81e4cc12d..bb544a410 100644 --- a/plat/arm/board/rddanielxlr/fdts/rddanielxlr_fw_config.dts +++ b/plat/arm/board/rddanielxlr/fdts/rddanielxlr_fw_config.dts @@ -10,7 +10,7 @@ / { dtb-registry { - compatible = "arm,dyn_cfg-dtb_registry"; + compatible = "fconf,dyn_cfg-dtb_registry"; /* tb_fw_config is temporarily contained on this dtb */ tb_fw-config { diff --git a/plat/arm/board/rde1edge/fdts/rde1edge_fw_config.dts b/plat/arm/board/rde1edge/fdts/rde1edge_fw_config.dts index 2719ab415..a5b4a583d 100644 --- a/plat/arm/board/rde1edge/fdts/rde1edge_fw_config.dts +++ b/plat/arm/board/rde1edge/fdts/rde1edge_fw_config.dts @@ -10,7 +10,7 @@ / { dtb-registry { - compatible = "arm,dyn_cfg-dtb_registry"; + compatible = "fconf,dyn_cfg-dtb_registry"; /* tb_fw_config is temporarily contained on this dtb */ tb_fw-config { diff --git a/plat/arm/board/rdn1edge/fdts/rdn1edge_fw_config.dts b/plat/arm/board/rdn1edge/fdts/rdn1edge_fw_config.dts index ba74b75bc..1f460f185 100644 --- a/plat/arm/board/rdn1edge/fdts/rdn1edge_fw_config.dts +++ b/plat/arm/board/rdn1edge/fdts/rdn1edge_fw_config.dts @@ -9,7 +9,7 @@ /dts-v1/; / { dtb-registry { - compatible = "arm,dyn_cfg-dtb_registry"; + compatible = "fconf,dyn_cfg-dtb_registry"; /* tb_fw_config is temporarily contained on this dtb */ tb_fw-config { diff --git a/plat/arm/board/sgi575/fdts/sgi575_fw_config.dts b/plat/arm/board/sgi575/fdts/sgi575_fw_config.dts index 605cc08b7..da933e546 100644 --- a/plat/arm/board/sgi575/fdts/sgi575_fw_config.dts +++ b/plat/arm/board/sgi575/fdts/sgi575_fw_config.dts @@ -10,7 +10,7 @@ / { dtb-registry { - compatible = "arm,dyn_cfg-dtb_registry"; + compatible = "fconf,dyn_cfg-dtb_registry"; /* tb_fw_config is temporarily contained on this dtb */ tb_fw-config { diff --git a/plat/arm/board/sgm775/fdts/sgm775_fw_config.dts b/plat/arm/board/sgm775/fdts/sgm775_fw_config.dts index c5702ca3d..306bd89b9 100644 --- a/plat/arm/board/sgm775/fdts/sgm775_fw_config.dts +++ b/plat/arm/board/sgm775/fdts/sgm775_fw_config.dts @@ -10,7 +10,7 @@ / { dtb-registry { - compatible = "arm,dyn_cfg-dtb_registry"; + compatible = "fconf,dyn_cfg-dtb_registry"; /* tb_fw_config is temporarily contained on this dtb */ tb_fw-config {