Introduce fdt_overlay_merge() to allow merge of overlay blob
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v2 Latest posting 2/26 patches 1 replyIn review
- v2 posting 1/26 patches 0 repliesSuperseded
Changes in v2 from the cover letter
- Introduction of new entry point, fdt_overlay_merge(), to handles merging
overlay blobs (rather than overload that in fdt_overlay_apply()).
- Removed use of printf() in libfdt. snprintf() is still used to help with string manipulation.
- Changed the logic to identify fragment nodes.
- Removed use of malloc/calloc and global variables.
- Incorporated a function that copies a node in the overlay tree along with its children and their properties.
Patches in v2 posting 2/2 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/6 | libfdt: overlay_merge: Introduce fdt_overlay_merge()libfdt/ libfdt/ | +71 | 0 replies | |
| 2/6 | libfdt: overlay_merge: Rename fragmentslibfdt/ | +326 | 0 replies | |
| 3/6 | libfdt: overlay_merge: Ignore unresolved symbolslibfdt/ | +205 | 0 replies | |
| 4/6 | libfdt: overlay_merge: remove resolved symbolslibfdt/ | +43 | 0 replies | |
| 5/6 | libfdt: overlay_merge: Copy over various nodes and their propertieslibfdt/ | +94 | 0 replies | |
| 6/6 | fdtoverlaymerge: A tool that merges overlaysMakefile Makefile.utils fdtoverlaymerge.c +1 more | +236 | 0 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.
Cover letter [PATCH v2 0/6] Introduce fdt_overlay_merge() to allow merge of overlay blob
Hello Upstream Team,
This is the second upstream attempt for the fdtoverlay changes and the first attempt can
be found here: https://www.spinics.net/lists/devicetree-compiler/msg01949.html. All of the issues/comments from the first attempt have been addressed and fixed in this patch.
Changelog:
v1 -> v2:
- Introduction of new entry point, fdt_overlay_merge(), to handles merging
overlay blobs (rather than overload that in fdt_overlay_apply()).
- Removed use of printf() in libfdt. snprintf() is still used to help with string manipulation.
- Changed the logic to identify fragment nodes.
- Removed use of malloc/calloc and global variables.
- Incorporated a function that copies a node in the overlay tree along with its children and their properties.
fdt_overlay_apply() API currently allows for an overlay DT blob to be merged with a base blob. It assumes that all external symbols specified in overlay blob's __fixups__ section are found in base blob's __symbols__ section and aborts on the first instance where a symbol could not be found in base blob.
This is mostly fine as the primary use of overlay is on a target for its bootloader to merge various overlay blobs based on h/w configuration detected?
We are exploring an extended use of fdt_overlay_apply() for offline use, i.e on the host (build machine) side, which requires merging two overlay DT blobs i.e the base (overlay) blob will not resolve all the external node references found in overlay blob.
Currently all the device-tree (DT) code for a given soc is maintained in a common kernel repository. For example, this common DT code will have code for audio, video, fingerprint, bluetooth etc. Further this DT code is typically split into a base (soc-common) code and board specific code, with the soc code being compiled as soc.dtb and board specific code being compiled as respective overlay blobs (board1.dtbo, board2.dtbo etc). soc.dtb represents hardware configuration of a given SOC while boardX.dtbo represents configuration of a board/platform designed using that soc.soc.dtb and boardX.dtbo files are flashed separately on target (besides improving the overall size of DT blobs flashed on target, Android Treble also requires separation of soc and board DT bits). Bootloader will pick one of the board overlay blobs and merge it with soc.dtb, before booting kernel which is presented a unified DT blob (soc + board overlay).
For ease of code maintenance and better control over release management, we are exploring allowing some of the tech teams (audio/fingerprint sensor etc) to maintain their kernel code (including their DT code) outside a common kernel repository. In our experience, this simplifies number of branches maintained in core kernel repo. New/experimental features in fingerprint sensor driver for example that needs to be on a separate branch will not result in unnecessary branching in core kenrel repo, affecting all other drivers.
In addition to compiling DT code outside core kernel tree, we also want to merge the blobs back to respective blobs found in kernel build tree (soc.dtb or boardX.dtbo), as otherwise relying on bootloader to do all the overlay impacts boot-time.
This brings up the need to merge two overlay blobs (fingerprint-overlay.dtbo + boardX.dtbo), which currently doesn't seem to be supported and which this patch series aims to support.
Additional notes:
If snprintf (in libc) may not available in some environments, then we will need to write our own snprintf() in libfdt.
Srivatsa Vaddagiri (6):
libfdt: overlay_merge: Introduce fdt_overlay_merge()
libfdt: overlay_merge: Rename fragments
libfdt: overlay_merge: Ignore unresolved symbols
libfdt: overlay_merge: remove resolved symbols
libfdt: overlay_merge: Copy over various nodes and their properties
fdtoverlaymerge: A tool that merges overlays
Makefile | 3 + Makefile.utils | 6 + fdtoverlaymerge.c | 223 ++++++++++++++++ libfdt/fdt_overlay.c | 742 +++++++++++++++++++++++++++++++++++++++++++++++++-- libfdt/libfdt.h | 18 ++ 5 files changed, 971 insertions(+), 21 deletions(-) create mode 100644 fdtoverlaymerge.c
Signature · 1 line
2.7.4