kernel
/
dtc
mirror of https://git.kernel.org/pub/scm/utils/dtc/dtc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fdtoverlay: Ignore symbols in overlays which don't apply to the target tree 

Symbols from overlays are merged into the target tree, and are required to
have the form:
	/fragment@XXX/__overlay__/...
If any symbols don't have this form, the overlay is rejected.

But there's not really anything wrong with an overlay having "local"
labels referring to a fragment node or some other metadata, that's not
expected to end up in a target tree.

So change our overlay application to simply ignore such symbols rather than
fail.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
main
David Gibson 2019-07-04 15:10:01 +10:00
parent b993534748
commit 5c715a4477
2 changed files with 11 additions and 4 deletions

11
libfdt/fdt_overlay.c
View File

@ -738,8 +738,11 @@ static int overlay_symbol_update(void *fdt, void *fdto)


/* get fragment name first */ /* get fragment name first */
s = strchr(path + 1, '/'); s = strchr(path + 1, '/');
if (!s) if (!s) {
return -FDT_ERR_BADOVERLAY; /* Symbol refers to something that won't end
* up in the target tree */
continue;
}


frag_name = path + 1; frag_name = path + 1;
frag_name_len = s - path - 1; frag_name_len = s - path - 1;
@ -756,7 +759,9 @@ static int overlay_symbol_update(void *fdt, void *fdto)
rel_path = ""; rel_path = "";
rel_path_len = 0; rel_path_len = 0;
} else { } else {
return -FDT_ERR_BADOVERLAY; /* Symbol refers to something that won't end
* up in the target tree */
continue;
} }


/* find the fragment index in which the symbol lies */ /* find the fragment index in which the symbol lies */

4
tests/stacked_overlay_addlabel.dts
View File

@ -1,8 +1,10 @@
/dts-v1/; /dts-v1/;
/plugin/; /plugin/;
/ { / {
fragment@1 { frag1: fragment@1 {
target-path = "/foonode"; target-path = "/foonode";
local: localinfo {
};
foo: __overlay__ { foo: __overlay__ {
overlay-1-property; overlay-1-property;
bar: barnode { bar: barnode {