aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |/
* | | | 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
| | |\ \
* | | | | 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
| | | | |\ \ \
| | | | | * | | qemu/optee: load OP-TEE pageable part 2MB above OP-TEE imageEtienne Carriere2017-10-261-3/+2
| | | | | |/ /
| | | | * | | Merge pull request #1143 from etienne-lms/qemu-hpendavidcunado-arm2017-10-262-1/+3
| | | | |\ \ \
| | | | | * | | qemu: fix holding pen mailbox sequenceEtienne Carriere2017-10-242-1/+3
| | | | | |/ /
| | | | * | | Merge pull request #1138 from michpappas/tf-issues#526_qemu_does_not_support_TBBdavidcunado-arm2017-10-264-49/+141
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | qemu: Add support for Trusted Board BootMichalis Pappas2017-10-254-49/+141
| | | | * | | Merge pull request #1139 from hzhuang1/fix_edmacdavidcunado-arm2017-10-233-0/+35
| | | | |\ \ \
| | | | | * | | HiKey: make RTC out of reset modeHaojian Zhuang2017-10-181-0/+11
| | | | | * | | HiKey: init EDMA controller with non secure modeHaojian Zhuang2017-10-182-0/+24
| | | | * | | | Merge pull request #1132 from jeenu-arm/pubsubdavidcunado-arm2017-10-236-0/+218
| | | | |\ \ \ \
| | | | | * | | | PSCI: Publish CPU ON eventJeenu Viswambharan2017-10-233-0/+25
| | | | | * | | | BL31: Introduce Publish and Subscribe frameworkJeenu Viswambharan2017-10-235-0/+193
| | | | |/ / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 16:12:07 +0000