| Message ID | 20250227-qcom-nonroot-overlays-v2-0-bde44f708cbe@trvn.ru (mailing list archive) |
|---|---|
| Headers | show |
| Series | {vision/navigation}-mezzanine: Fix overlay root node | expand |
On Thu, 27 Feb 2025 19:26:47 +0500, Nikita Travkin wrote: > While considering to propose WoA EL2 dt overlays upstream I was looking > at existing overlays and noticed that some of them are broken: they put > seemingly meaningful fixups into the overlay's "/" node, which places > them into the overlay "metadata" itself, not into a fixup fragment to be > applied to the actual dtb. This series fixes those two by changing to > full path "&{/}" which should work as it was initially intended. > > [...] Applied, thanks! [1/2] arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Drop CMA heap commit: 2a26a02e668ff101580647221c898d75ed93f8f5 [2/2] arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Drop CMA heap commit: 4de3e8d657f2111dd8d45c2ba0eef8b2437b85f2 Best regards,
While considering to propose WoA EL2 dt overlays upstream I was looking at existing overlays and noticed that some of them are broken: they put seemingly meaningful fixups into the overlay's "/" node, which places them into the overlay "metadata" itself, not into a fixup fragment to be applied to the actual dtb. This series fixes those two by changing to full path "&{/}" which should work as it was initially intended. See demonstration of the problem below: $ cat base.dts /dts-v1/; / { compatible = "fake,board"; fake,value = <42>; }; $ cat extra.dtso /dts-v1/; /plugin/; / { foo; bar { baz; }; }; &{/} { whatever-comes-next-after-baz; }; $ dtc base.dts -o base.dtb $ dtc extra.dtso -o extra.dtbo $ fdtoverlay -i base.dtb -o combine.dtb extra.dtbo $ dtc base.dtb /dts-v1/; / { compatible = "fake,board"; fake,value = <0x2a>; }; $ dtc extra.dtbo /dts-v1/; / { foo; bar { baz; }; fragment@0 { target-path = "/"; __overlay__ { whatever-comes-next-after-baz; }; }; }; $ dtc combine.dtb /dts-v1/; / { whatever-comes-next-after-baz; compatible = "fake,board"; fake,value = <0x2a>; }; In the resulting dtb foo bar and baz are missing. Signed-off-by: Nikita Travkin <nikita@trvn.ru> --- Changes in v2: - Just revert the original commits (Bryan) - Link to v1: https://lore.kernel.org/r/20250226-qcom-nonroot-overlays-v1-0-26c6e7605833@trvn.ru --- Nikita Travkin (2): arm64: dts: qcom: qrb5165-rb5-vision-mezzanine: Drop CMA heap arm64: dts: qcom: sdm845-db845c-navigation-mezzanine: Drop CMA heap arch/arm64/boot/dts/qcom/qrb5165-rb5-vision-mezzanine.dtso | 11 ----------- .../boot/dts/qcom/sdm845-db845c-navigation-mezzanine.dtso | 11 ----------- 2 files changed, 22 deletions(-) --- base-commit: be5c7bbb3a64baf884481a1ba0c2f8fb2f93f7c3 change-id: 20250226-qcom-nonroot-overlays-bfe21d33be8c Best regards,