aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-21Snap for 7478028 from a1c6ef3907c3915528513d13a612aeae7e12ec02 to ↵android-mainline-12.0.0_r97android-mainline-12.0.0_r85android-mainline-12.0.0_r68android-mainline-12.0.0_r41android-mainline-12.0.0_r21android-mainline-12.0.0_r1android12-mainline-adbd-releaseandroid-build-team Robot
mainline-adbd-release Change-Id: I334a740aa8032d21cfc3e5deb647b886f0b1f96c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 678be469e3 -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: 79afc4ee63 -s ours am: a09335b8cf -s ours am skip reason: Change-Id If3911be0b4ebb872b1c0630013afc7627b484548 with SHA-1 35f4807790 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I431d3c1a1a6ffd0e5164f966d1f9a9b180d72d1f
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 678be469e3 -s ↵android-s-v2-preview-1android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-s-v2-preview-1android-s-qpr3-beta-1Xin Li
ours am: 79afc4ee63 -s ours am skip reason: Change-Id If3911be0b4ebb872b1c0630013afc7627b484548 with SHA-1 35f4807790 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie994c4ac15380a58c209333ac08245eea8886183
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 678be469e3 -s oursXin Li
am skip reason: Change-Id If3911be0b4ebb872b1c0630013afc7627b484548 with SHA-1 35f4807790 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I06d86f911605a87c268240c62d12008383527a05
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: If3911be0b4ebb872b1c0630013afc7627b484548 Change-Id: Icae2afb484a5b94889ab4dd0f90035723513650f
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/dtc am: 88ad004dd5 am: cb833a423f ↵Bob Badour
am: fda2fad632 am: 7e4b3dab65 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1588886 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If4d2de863a7ce80e20bddad30867ad955035d316
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/dtc am: 88ad004dd5 am: cb833a423f ↵Bob Badour
am: fda2fad632 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1588886 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8c214c5b2997628f425f86562c7cb16ed6bf786d
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/dtc am: 88ad004dd5 am: cb833a423fBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1588886 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6fc0370457afc89fe12908f6bfef252a75e82b3b
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/dtc am: 88ad004dd5Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1588886 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I38aae77587517fcb62a8188813536b1f0259c2e8
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/dtcandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-BSD-2-Clause to: libfdt/Android.bp Added SPDX-license-identifier-BSD SPDX-license-identifier-BSD-2-Clause SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-ISC SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I77e096e006ed52d651da76a924f09da18696311c
2020-12-15add crosvm to com.android.virt am: 9591d1638e am: b01cc37bca am: 35f4807790Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1526499 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibd7197f735bc1f8ad75decbe4bc92a23c667f30a
2020-12-15add crosvm to com.android.virt am: 9591d1638e am: b01cc37bcaJiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1526499 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If3911be0b4ebb872b1c0630013afc7627b484548
2020-12-15add crosvm to com.android.virt am: 9591d1638eJiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1526499 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I25d3911c9e8bc39aa78639372d2653ff85e9a1dd
2020-12-14add crosvm to com.android.virtJiyong Park
To do so, crosvm and its dependencies have the apex_available property set to "//apex_available:platform", "com.android.virt" to explicitly acknowledge the joining. Bug: 174639241 Test: m com.android.virt Change-Id: I3e65cbf19ea47d2d20e31e5a8c034cfbc25d2d77
2020-11-24Mark ab/6881855 as merged am: c1f40d69c8 am: 001eb070afXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dtc/+/13112099 Change-Id: I71b5567f86f519ddda40254ddfd935a486e33d6c
2020-11-24Mark ab/6881855 as merged am: c1f40d69c8Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dtc/+/13112099 Change-Id: I56d2a71db89cfaba026efc7d98a07b08cf949dd3
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Id03bb380a75333d3692acdba9ad1bf44c7e90776
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 747653cfc3 -s ours am: ↵Xin Li
8c031e80a4 -s ours am: 861d994ea2 -s ours am skip reason: Change-Id I4f500e713213d8ae749fdeb3780c8de896353faf with SHA-1 5cc08d0874 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dtc/+/12796860 Change-Id: I4c0db992c4e886c9e04631a17d87ffce93453b6c
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 747653cfc3 -s ours am: ↵Xin Li
8c031e80a4 -s ours am skip reason: Change-Id I4f500e713213d8ae749fdeb3780c8de896353faf with SHA-1 5cc08d0874 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dtc/+/12796860 Change-Id: I90160a767d52bad39e35c21fe5e9de48236c82b2
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 747653cfc3 -s oursXin Li
am skip reason: Change-Id I4f500e713213d8ae749fdeb3780c8de896353faf with SHA-1 5cc08d0874 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dtc/+/12796860 Change-Id: I98f499e9d9edfea7e722f4b5b5c9222e84f0c81e
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I4f500e713213d8ae749fdeb3780c8de896353faf Change-Id: I75a09189005c9cecbd26fec5529c8e4c464728cc
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 679765a464 -s ours am: 40a2c809ce -s ours am: 55e9d1c595 -s ours am: f775c4ac96 -s ours am skip reason: Change-Id I6aafd36e9614cad20ad4c26d899f280cc1878e84 with SHA-1 a2d66c5f84 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dtc/+/12469908 Change-Id: Ia840fdf25e76bea6418985656855581a2c14a6da
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 679765a464 -s ours am: 40a2c809ce -s ours am: 55e9d1c595 -s ours am skip reason: Change-Id I6aafd36e9614cad20ad4c26d899f280cc1878e84 with SHA-1 a2d66c5f84 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dtc/+/12469908 Change-Id: I39c181ea2f4e0d1e50c0f370b66b26c0dba937b7
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 679765a464 -s ours am: 40a2c809ce -s ours am skip reason: Change-Id I6aafd36e9614cad20ad4c26d899f280cc1878e84 with SHA-1 a2d66c5f84 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dtc/+/12469908 Change-Id: I5e5b8b2a464a0065e61e2d0bf6d836364f0effa9
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 679765a464 -s ours am skip reason: Change-Id I6aafd36e9614cad20ad4c26d899f280cc1878e84 with SHA-1 a2d66c5f84 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/dtc/+/12469908 Change-Id: I939a720db963da31a74a9046bbf66dd7293bab10
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I6aafd36e9614cad20ad4c26d899f280cc1878e84 Change-Id: I274a6dc23a3345c4fab323039db4ced087135802
2020-07-31Enable shared library for libfdt am: 83534bb2d8 am: 642463b2f9 am: ↵Alistair Delva
b971c61158 am: 5cc08d0874 am: 1716bd2cdd Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1382604 Change-Id: Ibfa8978e738bfd1b4e9d49e127c3bfaa4842b78d
2020-07-31Enable shared library for libfdt am: 83534bb2d8 am: 642463b2f9 am: ↵Alistair Delva
b971c61158 am: 5cc08d0874 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1382604 Change-Id: I9a6650f9461697f5217f55e2256f21199391e123
2020-07-31Enable shared library for libfdt am: 83534bb2d8 am: 642463b2f9 am: b971c61158Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1382604 Change-Id: I4f500e713213d8ae749fdeb3780c8de896353faf
2020-07-31Enable shared library for libfdt am: 83534bb2d8 am: 642463b2f9Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1382604 Change-Id: I0c8c7953748460fb6c11b3f31487c5680ed7169a
2020-07-31Enable shared library for libfdt am: 83534bb2d8Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1382604 Change-Id: I4421691583e1b14fed944e8b55fcb31ab2f64bbc
2020-07-31Enable shared library for libfdtAlistair Delva
The dtc, fdtget and now crosvm.experimental host binaries can use libfdt. Make it a shared library instead of linking it statically into all of these tools. Change-Id: Ifefaaf3397ee6a1cd579bc140d03e69846e67745
2020-07-10Update dtc to 1.6.0 am: b734cfd607 am: 7713e835e7 am: a2d66c5f84 am: ↵Steve Muckle
7139aa3c99 am: da1de56263 Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1358703 Change-Id: I355d36cdcd8dcab5cb24a5d99878ddd204b0515d
2020-07-10Update dtc to 1.6.0 am: b734cfd607 am: 7713e835e7 am: a2d66c5f84 am: 7139aa3c99Steve Muckle
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1358703 Change-Id: I1d3a25b2768331be6ad6cd7a3695d80f6e7bfebb
2020-07-10Update dtc to 1.6.0 am: b734cfd607 am: 7713e835e7 am: a2d66c5f84Steve Muckle
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1358703 Change-Id: I1de647e7d9ca615873a77e792a0f0fb66bce927a
2020-07-10Update dtc to 1.6.0 am: b734cfd607 am: 7713e835e7Steve Muckle
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1358703 Change-Id: I6aafd36e9614cad20ad4c26d899f280cc1878e84
2020-07-10Update dtc to 1.6.0 am: b734cfd607Steve Muckle
Original change: https://android-review.googlesource.com/c/platform/external/dtc/+/1358703 Change-Id: Icd7fad094313aa7943331bee55abb0a9e75147d5
2020-07-09Update dtc to 1.6.0Steve Muckle
Upstream commit 9d7888cbf19c. Bug: 160825200 Change-Id: I1f8c79f09190af4025b186166a25b745710f2871
2020-06-24dtc: Consider one-character strings as stringsGeert Uytterhoeven
When using overlays, a target-path property pointing to the root node is quite common. However, "dtc -O dts" prints it as a byte array: target-path = [2f 00]; instead of a string: target-path = "/"; For guess_value_type() to consider a value to be a string, it must contain less nul bytes than non-nul bytes, thus ruling out strings containing only a single character. Allow printing such strings by relaxing the condition slightly. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Message-Id: <20200623094343.26010-1-geert+renesas@glider.be> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2020-06-22checks: Improve i2c reg property checkingJoel Stanley
The i2c bindings in the kernel tree describe support for 10 bit addressing, which must be indicated with the I2C_TEN_BIT_ADDRESS flag. When this is set the address can be up to 10 bits. When it is not set the address is a maximum of 7 bits. See Documentation/devicetree/bindings/i2c/i2c.txt. Take into account this flag when checking the address is valid. Signed-off-by: Joel Stanley <joel@jms.id.au> Message-Id: <20200622031005.1890039-3-joel@jms.id.au> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2020-06-22checks: Remove warning for I2C_OWN_SLAVE_ADDRESSJoel Stanley
dtc does a sanity check on reg properties that they are within the 10 bit address range for i2c slave addresses. In the case of multi-master buses or devices that act as a slave, the binding may describe an address that the bus will listen on as a device. Do not warn when this flag is set. See Documentation/devicetree/bindings/i2c/i2c.txt. This fixes the following build warnings reported by Stephen and by Arnd: arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts:126.11-130.4: Warning (i2c_bus_reg): /ahb/apb/bus@1e78a000/i2c-bus@80/ipmb1@10: I2C bus unit address format error, expected "40000010" arch/arm/boot/dts/aspeed-bmc-facebook-yosemitev2.dts:128.3-30: Warning (i2c_bus_reg): /ahb/apb/bus@1e78a000/i2c-bus@80/ipmb1@10:reg: I2C address must be less than 10-bits, got "0x40000010" Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Reported-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Joel Stanley <joel@jms.id.au> Message-Id: <20200622031005.1890039-2-joel@jms.id.au> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2020-06-19libfdt: add extern "C" for C++Patrick Oppenlander
Signed-off-by: Patrick Oppenlander <patrick.oppenlander@gmail.com> Message-Id: <20200616011217.15253-1-patrick.oppenlander@gmail.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2020-06-18libfdt: trivial typo fixPatrick Oppenlander
Signed-off-by: Patrick Oppenlander <patrick.oppenlander@gmail.com> Message-Id: <20200618042117.131731-1-patrick.oppenlander@gmail.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2020-06-16libfdt: Correct condition for reordering blocksSimon Glass
This condition uses bitwise OR but should be logical OR. Fix it. Signed-off-by: Simon Glass <sjg@chromium.org> Reported-by: kernel test robot <lkp@intel.com> Message-Id: <20200615160033.87328-1-sjg@chromium.org> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2020-05-18checks: Add interrupt provider testAndre Przywara
An interrupt provider (an actual interrupt-controller node or an interrupt nexus) should have both #address-cells and #interrupt-cells properties explicitly defined. Add an extra test for this. We check for the #interrupt-cells property already, but this does not cover every controller so far, only those that get referenced by an interrupts property in some node. Also we miss interrupt nexus nodes. A missing #address-cells property is less critical, but creates ambiguities when used in interrupt-map properties, so warn about this as well now. This removes the now redundant warning in the existing interrupts test. Signed-off-by: Andre Przywara <andre.przywara@arm.com> Message-Id: <20200515141827.27957-2-andre.przywara@arm.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2020-05-14Makefile: when building libfdt only, do not add unneeded depsClaudio Fontana
implemented originally for the QEMU consumer of libfdt. Signed-off-by: Claudio Fontana <cfontana@suse.de> Message-Id: <20200512103315.1926-1-cfontana@suse.de> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2020-05-04Add METADATA to dtc: LGPL+GPL=RESTRICTED am: d0d4dc4b82 am: 4b9b2da7a7 am: ↵Bob Badour
b74bbcf1f9 am: 8301a5c37c am: 2583eaa841 Change-Id: I7f1c02f8a9cc2240fa88b3ad00117ff92846adc9
2020-05-04Add METADATA to dtc: LGPL+GPL=RESTRICTED am: d0d4dc4b82 am: 4b9b2da7a7 am: ↵Bob Badour
b74bbcf1f9 am: 8301a5c37c Change-Id: I1c1fc3ba01c3d027a684c54ac3c4b8f9f419c1d2
2020-05-04Add METADATA to dtc: LGPL+GPL=RESTRICTED am: d0d4dc4b82 am: 4b9b2da7a7 am: ↵Bob Badour
b74bbcf1f9 Change-Id: I47220aa96d686283b2378817f78026159e12236b
2020-05-04Add METADATA to dtc: LGPL+GPL=RESTRICTED am: d0d4dc4b82 am: 4b9b2da7a7Bob Badour
Change-Id: I430e5d621f54981e1b0a464db1a42e89950f221d