aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add METADATA to arm-trusted-firmware: BSD+LLVM+MIT=NOTICE am: e85755b569HEADandroid-r-beta-3android-r-beta-2masterBob Badour2020-05-051-0/+3
|\
| * Add METADATA to arm-trusted-firmware: BSD+LLVM+MIT=NOTICEBob Badour2020-05-011-0/+3
|/
* [automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-vts-11.0_r5android-vts-11.0_r4android-vts-11.0_r3android-vts-11.0_r2android-vts-11.0_r1android-security-11.0.0_r1android-r-preview-4android-r-preview-3android-r-preview-2android-r-preview-1android-platform-11.0.0_r9android-platform-11.0.0_r8android-platform-11.0.0_r7android-platform-11.0.0_r6android-platform-11.0.0_r5android-platform-11.0.0_r4android-platform-11.0.0_r3android-platform-11.0.0_r2android-platform-11.0.0_r1android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-mainline-10.0.0_r4android-cts-11.0_r5android-cts-11.0_r4android-cts-11.0_r3android-cts-11.0_r2android-cts-11.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r5android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r4android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r3android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r25android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r2android-11.0.0_r19android-11.0.0_r18android-11.0.0_r17android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android-11.0.0_r1android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12ndk-sysroot-r21android11-tests-releaseandroid11-security-releaseandroid11-s1-releaseandroid11-releaseandroid11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-platform-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li2019-02-240-0/+0
|\
| * DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13Xin Li2019-02-200-0/+0
| |\
* | \ [automerger skipped] DO NOT MERGE am: 9ad008461f -s ours am: 3bd4ac90be -s ...Xin Li2018-12-100-0/+0
|\ \ \ | | |/ | |/|
| * | [automerger skipped] DO NOT MERGE am: 9ad008461f -s oursXin Li2018-12-100-0/+0
|/| | | |/
| * [automerger skipped] DO NOT MERGEXin Li2018-12-100-0/+0
|/|
| * DO NOT MERGEandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseXin Li2018-12-070-0/+0
|/|
| * Snap for 4551672 from b23f5fb1ac2033077c7204f604b2c74649b0e9a3 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-platform-releasepie-gsipie-cuttlefish-testingpie-cts-releaseandroid-build-team Robot2018-01-182-0/+4
| |\ | |/ |/|
* | Merge remote-tracking branch 'aosp/upstream-hikey' into atf am: 8608ac5262 am...android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devoreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseDmitry Shmidt2018-01-172-0/+4
|\ \
| * \ Merge remote-tracking branch 'aosp/upstream-hikey' into atf am: 8608ac5262Dmitry Shmidt2018-01-172-0/+4
| |\ \
| | * \ Merge remote-tracking branch 'aosp/upstream-hikey' into atfDmitry Shmidt2018-01-172-0/+4
| | |\ \
| | | * | Merge remote-tracking branch 'aosp/upstream-hikey' into atfandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-5android-p-preview-4android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7Dmitry Shmidt2018-01-172-0/+4
| | |/| |
| | | * | Merge pull request #20 from hzhuang1/fix_pcie_2upstream-hikey-tempupstream-hikeyHaojian Zhuang2018-01-102-0/+4
| | | |\ \
| | | | * | Hikey960: Fix hikey960 pcie mount failKaihua Zhong2018-01-102-0/+4
| | | |/ /
| | | | * Snap for 4453288 from ccf328ed59547bb032796dbc8bb875def8bea0c8 to pi-releaseandroid-build-team Robot2017-11-150-0/+0
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li2017-11-150-0/+0
|\| | | |
| * | | | Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li2017-11-140-0/+0
| |\| | |
| | * | | Merge commit 'c3a21abd5624f1d9bce9f3b009c0af408a0c22ec' into HEADXin Li2017-11-130-0/+0
| | |\ \ \
| | | | | * Snap for 4447680 from 377cb66540e9f5f26b97c779a411a302eeaf45a9 to pi-releaseandroid-build-team Robot2017-11-121163-40725/+140159
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge remote-tracking branch 'aosp/upstream-hikey' into armtf am: d7f137ecb7 ...Dmitry Shmidt2017-11-091163-40725/+140159
|\| | | | |
| * | | | | Merge remote-tracking branch 'aosp/upstream-hikey' into armtf am: d7f137ecb7Dmitry Shmidt2017-11-091163-40725/+140159
| |\| | | | | | |/ / / | |/| | |
| | * | | Merge remote-tracking branch 'aosp/upstream-hikey' into armtfDmitry Shmidt2017-11-091163-40725/+140159
| | |\ \ \
| | | * | | Merge remote-tracking branch 'aosp/upstream-hikey' into armtfandroid-o-mr1-iot-preview-6o-mr1-iot-preview-6Dmitry Shmidt2017-11-091163-40725/+140159
| | |/| | | | | | |/ /
| | | * | Merge pull request #19 from johnstultz-work/bootloader-updateHaojian Zhuang2017-11-091163-40725/+140159
| | | |\ \
| | | | * \ Merge commit '92c5066c93bb0c027c9ea8d7028d4fb722d3aec2' into bootloader-updateJohn Stultz2017-11-0740-99/+556
| | | | |\ \
| | | | | * \ Merge pull request #1153 from robertovargas-arm/fix-macrosdavidcunado-arm2017-11-069-21/+25
| | | | | |\ \
| | | | | | * | Fix usage of IMAGE_BLx macrosRoberto Vargas2017-11-017-19/+19
| | | | | | * | Always define ARM_TSP_RAM_LOCATION_IDRoberto Vargas2017-11-011-2/+5
| | | | | | * | Include debug.h in debug.SRoberto Vargas2017-11-011-0/+1
| | | | | * | | Merge pull request #1151 from JoelHutton/jh/MISRA-Mandatorydavidcunado-arm2017-11-031-6/+6
| | | | | |\ \ \
| | | | | | * | | Change sizeof to use type of struct not functionJoel Hutton2017-10-311-6/+6
| | | | | | |/ /
| | | | | * | | Merge pull request #1142 from etienne-lms/qemu-intdavidcunado-arm2017-11-031-11/+30
| | | | | |\ \ \
| | | | | | * | | qemu: update deprecated interrupt registeringEtienne Carriere2017-11-021-11/+30
| | | | | * | | | Merge pull request #1137 from soby-mathew/sm/arm_plat_en_gicv3_savedavidcunado-arm2017-11-0317-31/+291
| | | | | |\ \ \ \
| | | | | | * | | | ARM platforms: enable GICv3 state save/restoreSoby Mathew2017-10-1111-28/+229
| | | | | | * | | | ARM platforms: Add support for EL3 TZC memory regionSoby Mathew2017-10-116-3/+62
| | | | | * | | | | Merge pull request #1150 from dp-arm/dp/eventsdavidcunado-arm2017-11-013-19/+41
| | | | | |\ \ \ \ \
| | | | | | * | | | | aarch64: Add PubSub events to capture security state transitionsDimitris Papastamos2017-10-313-19/+41
| | | | | * | | | | | Merge pull request #1149 from robertovargas-arm/fwu-testingdavidcunado-arm2017-10-311-0/+50
| | | | | |\ \ \ \ \ \
| | | | | | * | | | | | Add FWU booting instructions to the user guideRoberto Vargas2017-10-311-0/+50
| | | | | | | |_|_|/ / | | | | | | |/| | | |
| | | | | * | | | | | Merge pull request #1141 from robertovargas-arm/boot_redundancydavidcunado-arm2017-10-316-3/+91
| | | | | |\ \ \ \ \ \ | | | | | | |_|/ / / / | | | | | |/| | | | |
| | | | | | * | | | | Add platform hooks for boot redundancy supportRoberto Vargas2017-10-246-3/+91
| | | | | | | |_|/ / | | | | | | |/| | |
| | | | | * | | | | Merge pull request #1144 from geesun/qx/resize_bl2_sizedavidcunado-arm2017-10-305-8/+22
| | | | | |\ \ \ \ \ | | | | | | |_|/ / / | | | | | |/| | | |
| | | | | | * | | | plat/arm: enlarge the BL2 size on Arm platforms when TBB is enabledQixiang Xu2017-10-253-5/+13
| | | | | | * | | | plat/arm: change the default option of ARM_TSP_RAM_LOCATIONQixiang Xu2017-10-252-3/+9
| | | | | | |/ / /
| | | | * | | | | Merge branch 'armtf/master/update' into bootloader-updateJohn Stultz2017-10-301161-40722/+139699
| | | |/| | | | | | | |/| | | | | |
| | | | * | | | | armtf: hikey_ddr: Add NOTICE message to avoid boot hang (racy!)John Stultz2017-10-301-0/+1
| | | | * | | | | Use -fno-picJohn Stultz2017-10-301-1/+1
| | | | |/ / / /
| | | | * | | | Merge pull request #1147 from etienne-lms/qemu-optee-loaddavidcunado-arm2017-10-271-3/+2
| | | | |\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 23:39:42 +0000