Commit Graph

8 Commits

Author SHA1 Message Date
Alexander Koskovich
40161df056 merge_dtbs: Add qcom,oem-id to EXTRA_KEYS
This is used by Nothing to differentiate between the base & pro models
on the Phone (3a).

Change-Id: I56f7e58f134571ea35a6dafef54e2b30ba20b5f0
2025-06-14 18:24:24 +00:00
Cosmin Tanislav
49cbf625f2 merge_dtbs: ignore not matching DTBOs when finding symbols for a fixup
Change-Id: I1705341d9ec68b46ac6f6c1007c6ea28f9c4e95d
2025-06-11 05:53:44 +00:00
Cosmin Tanislav
0ea2a44fbc merge_dtbs: Sort DTBOs based on needed symbols
Some DTBOs might use symbols from other DTBOs and require them to be
applied before them.

Sort them based on the __symbols__ and __fixups__ nodes, by creating a
dependency graph.

Change-Id: I40acf5da6b673b636a91f75ae3f3c634f2b5c505
2025-06-08 18:34:54 +03:00
Arian
eef4080d27 android: merge_dtbs: Respect oem specific extra ids
Some OEMs add their own properties to avoid merging incompatible
overlays for different devices with the same QCOM soc.

Change-Id: Ic5b38a122173d8e9ecc1f0f399411cb37acf3150
2025-04-18 16:08:24 +08:00
Guru Das Srinagesh
8e2709c91e merge_dtbs: Craft unique name for final saved merged trees
Incorporate the hash of a combination of all msm-ids, board-ids, and
pmic-ids of the InnerMergedDeviceTree in the final filenames of the
saved InnerMergedDeviceTrees.

Change-Id: I629e1a274b23d71061c547578d1ddbcf92c8cf79
Signed-off-by: Guru Das Srinagesh <quic_gurus@quicinc.com>
2025-01-30 19:16:33 +08:00
Guru Das Srinagesh
81c8cad9e8 merge_dtbs: Use logging and argparse
Use the logging module to log important information to various log
levels: info, debug, warning and error.
- Modify __str__ representations of classes DeviceTree and
  InnerMergedDeviceTree for readability in debug logs
- Make parse_dt_files() return instead of yield so as to order all the
  filename parsing at one go after the preceding log messages

Use the argparse module to specify script arguments cleanly. Also make
the corresponding change to merge_dtbs.sh to invoke this script with the
correct flags.

Change-Id: Id09d9d7b34cde60eff99876f0c0c4f6643852aee
Signed-off-by: Guru Das Srinagesh <quic_gurus@quicinc.com>
2025-01-30 19:16:33 +08:00
Guru Das Srinagesh
bd92c42017 merge_dtbs.py: Print only basenames of dtb* files
When debugging issues with the script, it helps to not have in the
script's output the fully qualified path names of the DTB and DTBO files
being merged as they are very lengthy. Retain only the relevant parts of
the filnames - the basenames for better readability.

Change-Id: Ia18584fcf9ff173c4b22d4543c83c4091e15b8f8
Signed-off-by: Guru Das Srinagesh <quic_gurus@quicinc.com>
2025-01-30 19:14:46 +08:00
Aaron Kling
0d1608e30f kernel: Support Qualcomm merge_dtbs script
Script from clo kernel/build at kernel.lnx.5.10.r1-rel

Change-Id: Ia90975c895644b86d9f861ddd5a18b7cf6ce1470
2023-08-28 19:15:02 +03:00