len0rd/dtc
1
0
Fork 0
mirror of https://github.com/dgibson/dtc.git synced 2026-01-22 01:30:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

libfdt: overlay: Fix phandle overwrite check for new subtrees

Browse source 
If the overlay's target is only created in a previous fragment, it
doesn't exist in the unmodified base device tree. For the phandle
overwrite check this can be ignored because in this case the base tree
doesn't contain a phandle that could be overwritten.

Adapt the corresponding check to not error out if that happens but just
continue with the next fragment.

This is currently triggered by
arch/arm64/boot/dts/renesas/salvator-panel-aa104xd12.dtso in the kernel
repository which creates /panel in its first fragment and modifies it in
its second.

Reported-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/all/CAL_JsqL9MPycDjqQfPNAuGfC6EMrdzUivr+fuOS7YgU3biGd4A@mail.gmail.com/
Fixes: 1fad065080 ("libfdt: overlay: ensure that existing phandles are not overwritten")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@baylibre.com>
Message-ID: <20240626075551.2493048-2-u.kleine-koenig@baylibre.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Uwe Kleine-König 2024-06-26 09:55:52 +02:00 • committed by David Gibson
parent 49d3089446
commit 61e88fdcec
3 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/overlay_overlay_bypath.dts
View file

@ -46,3 +46,7 @@
new-sub-test-property;
};
};
&{/new-local-node} {
another-new-property;
};

8
tests/overlay_overlay_no_fixups.dts
View file

@ -72,6 +72,14 @@
};
};
fragment@7 {
target-path = "/new-local-node";
__overlay__ {
another-new-property;
};
};
__local_fixups__ {
fragment@5 {
__overlay__ {