aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-26Upgrade dtc to v1.7.0HEADmastermainSadaf Ebrahimi
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update external/dtc For more info, check https://cs.android.com/android/platform/superproject/+/main:tools/external_updater/README.md Test: TreeHugger Change-Id: I7c3774a5f8fbc6ddf0926df9db3450c4dce54cf9
2024-02-09Add new build rule for running dtc on Android am: e3cf23ab6aemu-34-2-devJaewan Kim
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2953028 Change-Id: I5077b8208fb2ffa7f827be2c06cdc2165f6f2a62 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-09Add new build rule for running dtc on Androidemu-34-3-releaseJaewan Kim
dtc_static links libfdt statically for simpler test setup. Otherwise libfdt.so should be manually pushed. (tested with data, data_bins, and required with rust_test target) Change-Id: Ic975258c7e0030cbeeb5c8c0df611d8aa439b3c8 Test: Manually
2024-01-30Set dtc as dependency of dtdiff am: 5379c8790eJaewan Kim
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2929812 Change-Id: I7f40925174c72a763563372cc75a0fa1763dce8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29Set dtc as dependency of dtdiffJaewan Kim
Change-Id: I7e5e604ff5b760210a3d615d4b4a0b0d9e04fc9a Test: T/H
2024-01-26ANDROID: Format Android.bp am: d202bf04b2Jaewan Kim
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2926154 Change-Id: Ie4db788c478e0545fe58a9422e22fa73d228f324 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-25ANDROID: Add dtdiff target for testing am: 7ebab26ea6Jaewan Kim
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2926152 Change-Id: I950fad68daec5a0a868aee3caf069404e02477b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-24ANDROID: Format Android.bpJaewan Kim
Test: T/H Change-Id: I0e37d1ac6d36f20a164cbbe3aeb653d1dbae3550
2024-01-24ANDROID: Add dtdiff target for testingJaewan Kim
Test: m dtdiff && dtdiff a.dtb b.dtb Change-Id: I38790cd62e1e6e7b94cd489a6f94f3ba185f27f6
2023-10-12Merge changes I1e5a8903,I43c6ad22,If9a102a6,I702e619c into main am: ↵Pierre-Clément Tosi
e5b8c171c5 am: 132ab4d211 am: 59703fa923 am: cc558f2f2a am: 5ec1ec09d0 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784253 Change-Id: I7aad50747418f387e4f6e8c01404a2caf6b2316c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I0b17b082,I894051ed,I662a5997 into main am: 6cda0a19bb am: ↵Pierre-Clément Tosi
14b204d707 am: a23524bad8 am: dc5c2d983f am: 13a364e68b Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784256 Change-Id: I2a17540cb29bdcad277dc5bb459dfe03c332b840 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I8efee39a,I5295898f into main am: 1fe80c59e9 am: 9da6d57591 ↵Pierre-Clément Tosi
am: f25c58e67f am: 4b55e461f4 am: 1f58b343aa Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784352 Change-Id: Icce4d3b2537abf28eb31258cf458786a6138f586 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I1e5a8903,I43c6ad22,If9a102a6,I702e619c into main am: ↵android-u-qpr3-beta-1-gplandroid-u-qpr2-beta-2-gplPierre-Clément Tosi
e5b8c171c5 am: 132ab4d211 am: 59703fa923 am: cc558f2f2a Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784253 Change-Id: I379f195d1319c795ab79b32d96845401672a6dd8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I0b17b082,I894051ed,I662a5997 into main am: 6cda0a19bb am: ↵Pierre-Clément Tosi
14b204d707 am: a23524bad8 am: dc5c2d983f Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784256 Change-Id: Ia2572338b7063cdff47fb37a3907f15109a37a33 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I8efee39a,I5295898f into main am: 1fe80c59e9 am: 9da6d57591 ↵Pierre-Clément Tosi
am: f25c58e67f am: 4b55e461f4 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784352 Change-Id: Ie1d6718e96616c26c9a378ee6aa20bae40f9e0d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I1e5a8903,I43c6ad22,If9a102a6,I702e619c into main am: ↵Pierre-Clément Tosi
e5b8c171c5 am: 132ab4d211 am: 59703fa923 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784253 Change-Id: Idcdb4013ebdcbfcf6645559af240afa9dadad552 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I0b17b082,I894051ed,I662a5997 into main am: 6cda0a19bb am: ↵Pierre-Clément Tosi
14b204d707 am: a23524bad8 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784256 Change-Id: Ic7243a79750a8f3057f0109ff11c8163f07544a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I8efee39a,I5295898f into main am: 1fe80c59e9 am: 9da6d57591 ↵Pierre-Clément Tosi
am: f25c58e67f Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784352 Change-Id: I65a9557ee7f58ee57e72b42833b817afa063f14a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I1e5a8903,I43c6ad22,If9a102a6,I702e619c into main am: ↵Pierre-Clément Tosi
e5b8c171c5 am: 132ab4d211 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784253 Change-Id: Idee4fb28354825e3a1e104099528e22821a3986c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I0b17b082,I894051ed,I662a5997 into main am: 6cda0a19bb am: ↵Pierre-Clément Tosi
14b204d707 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784256 Change-Id: Iae8a7309c28536ca83f39b2471eaf6bd15006768 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I8efee39a,I5295898f into main am: 1fe80c59e9 am: 9da6d57591Pierre-Clément Tosi
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784352 Change-Id: Ibd8df9868d097e36b8def39a1c655f58e42cb640 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I1e5a8903,I43c6ad22,If9a102a6,I702e619c into main am: e5b8c171c5Pierre-Clément Tosi
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784253 Change-Id: I0afccef8cf1d66b917fb815c72692f047b7b7672 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I0b17b082,I894051ed,I662a5997 into main am: 6cda0a19bbPierre-Clément Tosi
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784256 Change-Id: I443a3252399495cb3d2274a224e5f9184187e686 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I8efee39a,I5295898f into main am: 1fe80c59e9Pierre-Clément Tosi
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784352 Change-Id: Iadf79304e0769fb62b886b93d116eb256bf89024 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I1e5a8903,I43c6ad22,If9a102a6,I702e619c into mainandroid-u-rb-dp-10-gplandroid-u-rb-dp-10-gplPierre-Clément Tosi
* changes: FROMGIT: libfdt: fdt_get_alias_namelen: Validate aliases FROMGIT: use fdt_path_getprop_namelen() in fdt_get_alias_namelen() FROMGIT: add fdt_path_getprop_namelen() helper ANDROID: Revert "libfdt: Validate alias property value is a valid string."
2023-10-12Merge changes I0b17b082,I894051ed,I662a5997 into mainPierre-Clément Tosi
* changes: FROMLIST: libdft: fdt_next_tag: Harden offset overflow check FROMGIT: libfdt: prevent integer overflow in fdt_next_tag ANDROID: Revert "Fix integer wrap sanitisation."
2023-10-12Merge changes I8efee39a,I5295898f into mainPierre-Clément Tosi
* changes: FROMGIT: libfdt: fdt_path_offset_namelen: Reject empty path ANDROID: Revert "libfdt: fdt_path_offset_namelen: Reject empty paths"
2023-10-12Merge changes I6b780c1d,I238d963a,I32076c65 into main am: 51f1006440 am: ↵Pierre-Clément Tosi
dc59b8c5ce am: 15ee7e75ee am: 260ca43c05 am: 413967daf9 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784358 Change-Id: If27eaab096fbbaed77317669e59938fcce1b611c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12ANDROID: Use -Wall and more when building libfdt am: 170bf1d4ce am: ↵Pierre-Clément Tosi
350d496637 am: 98f5673dc6 am: 7a55909ac6 am: 6b0a343f75 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784258 Change-Id: I3a1043f37b4f1c7279f3ece28692fba6858b76f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12ANDROID: Use -Wno-macro-redefined for DTC tools am: 6c25e96cf6 am: ↵Pierre-Clément Tosi
bcf99873a6 am: 885653f48b am: 206c37454a am: 036151f416 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784257 Change-Id: Ifcfc694b6703b0470f95b08c7716d33da4cc865e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I6b780c1d,I238d963a,I32076c65 into main am: 51f1006440 am: ↵Pierre-Clément Tosi
dc59b8c5ce am: 15ee7e75ee am: 260ca43c05 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784358 Change-Id: I97ea7cbaa3d42e1a186eaf8201d066fdd4709e16 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12ANDROID: Use -Wall and more when building libfdt am: 170bf1d4ce am: ↵Pierre-Clément Tosi
350d496637 am: 98f5673dc6 am: 7a55909ac6 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784258 Change-Id: I0ee033f59b97bc940f04ed95f4461350ddb65019 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12ANDROID: Use -Wno-macro-redefined for DTC tools am: 6c25e96cf6 am: ↵Pierre-Clément Tosi
bcf99873a6 am: 885653f48b am: 206c37454a Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784257 Change-Id: If7595ea8fed0508933473ee3d120af2f36e2341f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I6b780c1d,I238d963a,I32076c65 into main am: 51f1006440 am: ↵Pierre-Clément Tosi
dc59b8c5ce am: 15ee7e75ee Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784358 Change-Id: I2aefd49fb0818eca8010a53d8b44146c3654392c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12ANDROID: Use -Wall and more when building libfdt am: 170bf1d4ce am: ↵Pierre-Clément Tosi
350d496637 am: 98f5673dc6 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784258 Change-Id: Ic1326085efd754b8c03e79170c50740e70a4c1f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12ANDROID: Use -Wno-macro-redefined for DTC tools am: 6c25e96cf6 am: ↵Pierre-Clément Tosi
bcf99873a6 am: 885653f48b Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784257 Change-Id: I12afdcbd80900de0afb69abed9efcf7d4df2424f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I6b780c1d,I238d963a,I32076c65 into main am: 51f1006440 am: ↵Pierre-Clément Tosi
dc59b8c5ce Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784358 Change-Id: I485f71bdcbe6d8a17f4575d2e58ce5ef43e56fe0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12ANDROID: Use -Wall and more when building libfdt am: 170bf1d4ce am: 350d496637Pierre-Clément Tosi
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784258 Change-Id: I2d07fa447fcd0ff3c77eaae93fb4bd53705279b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12ANDROID: Use -Wno-macro-redefined for DTC tools am: 6c25e96cf6 am: bcf99873a6Pierre-Clément Tosi
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784257 Change-Id: I2ee3a2bfb91b4fec1336b924c264d53b9e975483 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I6b780c1d,I238d963a,I32076c65 into main am: 51f1006440Pierre-Clément Tosi
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784358 Change-Id: I3768082e802dc56c58e59e2a4d8e246b65dd17b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12ANDROID: Use -Wall and more when building libfdt am: 170bf1d4cePierre-Clément Tosi
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784258 Change-Id: I23a72a503c51497cc6c4430714d2f2dd94d4fd79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12ANDROID: Use -Wno-macro-redefined for DTC tools am: 6c25e96cf6Pierre-Clément Tosi
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/2784257 Change-Id: I097e3cfc84c67ab620f35e9fe8194f073140d02b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12Merge changes I6b780c1d,I238d963a,I32076c65 into mainPierre-Clément Tosi
* changes: ANDROID: Generate version_gen.h in Soong and Bazel ANDROID: bazel: Clean up lexer and parser rules ANDROID: bazel: Fix dtc header dependencies
2023-10-11ANDROID: Generate version_gen.h in Soong and BazelPierre-Clément Tosi
Upstream provides a DTC_VERSION preprocessor macro to its C code by generating a version_gen.h header from either of its supported build systems: Make formats the header from its internal variables (VERSION, PATCHLEVEL, SUBLEVEL, ...) while Meson uses its vcs_tag() function on a template, version_gen.h.in. As AOSP doesn't make use of these build systems, aosp/204511 decided to hardcode a version_non_gen.h file and patch the corresponding #include. This unsurprisingly ended up bitrotting as the repo was being upgraded. Instead, replicate the version_gen.h.in patching in our build systems, extracting the version number from the METADATA file, which external_updater.sh will keep up-to-date. Note that this introduces a dependency on sed in the genrule(), the impact of which is minimized by making METADATA_version.sed POSIX-compliant. Keep appending the suffix '-Android-build' to the upstream version. Test: m dtc && ${ANDROID_HOST_OUT}/bin/dtc --version Test: bazel build //:dtc && bazel-bin/dtc --version Change-Id: I6b780c1dbe14d415891defeb652f0692988ed0b1
2023-10-11FROMGIT: libfdt: fdt_get_alias_namelen: Validate aliasesPierre-Clément Tosi
Ensure that the alias found matches the device tree specification v0.4: Each property of the /aliases node defines an alias. The property name specifies the alias name. The property value specifies the full path to a node in the devicetree. This protects against a stack overflow caused by fdt_path_offset_namelen(fdt, path, namelen) calling fdt_path_offset(fdt, fdt_get_alias_namelen(fdt, path, namelen)) leading to infinite recursion on DTs with "circular" aliases. This fix was originally written by Mike McTernan for Android in [1]. [1]: https://android.googlesource.com/platform/external/dtc/+/9308e7f9772bd226fea9925b1fc4d53c127ed4d5 Signed-off-by: Pierre-Clément Tosi <ptosi@google.com> Acked-by: Mike McTernan <mikemcternan@google.com> Message-ID: <20231010092725.63h7c45p2fnmj577@google.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> (cherry-picked from commit 79b9e326a162b15ca5758ee214e350f4f7c038fe git://git.kernel.org/pub/scm/utils/dtc/dtc.git main) Test: N/A Change-Id: I1e5a89039f6b70c82e17739379d97dbf130036e8
2023-10-11FROMGIT: use fdt_path_getprop_namelen() in fdt_get_alias_namelen()Rasmus Villemoes
Simplify the code by making use of the new helper. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> (cherry-picked from commit 18f5ec12a10ec84e957222074dadf4a3e4cc8d59 git://git.kernel.org/pub/scm/utils/dtc/dtc.git main) Test: N/A Change-Id: I43c6ad22dbaa718cd77421a44d5e87d188d26ca0
2023-10-11FROMGIT: add fdt_path_getprop_namelen() helperRasmus Villemoes
Add a wrapper for fdt_getprop_namelen() allowing one to specify the node by path instead of offset. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> (cherry-picked from commit df093279282ca0cff4d20ceb3bb5857117ed4cc4 git://git.kernel.org/pub/scm/utils/dtc/dtc.git main) Test: N/A Change-Id: If9a102a622dfa726b7cb10f58c38f1b52d233be6
2023-10-11ANDROID: Revert "libfdt: Validate alias property value is a valid string."Pierre-Clément Tosi
This reverts commit 9308e7f9772bd226fea9925b1fc4d53c127ed4d5. Revert the Android patch to apply the upstream fix [1] instead. [1]: https://android.googlesource.com/platform/external/dtc/+/79b9e326a162b15ca5758ee214e350f4f7c038fe Test: N/A Change-Id: I702e619c875449b5efda529d01350117a1c4a435
2023-10-11FROMLIST: libdft: fdt_next_tag: Harden offset overflow checkPierre-Clément Tosi
As 'offset' is obtained through various paths within the function by adding user-provided values to 'startoffset' and as we validate its final value by substracting it from the initial one, there is a risk that one of the paths might have lead to an overflow, making the check validate a "negative" (wrong) length, potentially causing fdt_next_tag() to report an invalid offset as valid through 'nextoffset'. For example, when parsing an FDT_PROP, we currently validate that offset = startoffset + len + FDT_TAGSIZE doesn't overflow but then assign offset = startoffset + len + sizeof(struct fdt_property) so harden all paths by validating the offset in the very last check. Signed-off-by: Pierre-Clément Tosi <ptosi@google.com> (am from https://lore.kernel.org/devicetree-compiler/20231011172427.g4tlsew3wsjtddil@google.com/) Test: N/A Change-Id: I0b17b0827ccc0ece0a2d1795b388408fb599aed7
2023-10-11FROMGIT: libfdt: prevent integer overflow in fdt_next_tagTadeusz Struk
Since fdt_next_tag() in a public API function all input parameters, including the fdt blob should not be trusted. It is possible to forge a blob with invalid property length that will cause integer overflow during offset calculation. To prevent that, validate the property length read from the blob before doing calculations. Signed-off-by: Tadeusz Struk <tadeusz.struk@linaro.org> Message-Id: <20221005232931.3016047-1-tadeusz.struk@linaro.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> (cherry-picked from commit 73590342fc85ca207ca1e6cbc110179873a96962 git://git.kernel.org/pub/scm/utils/dtc/dtc.git main) Test: N/A Change-Id: I894051ed101255800717001a71a5a74ac66fd897
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 14:53:32 +0000