aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'aosp/upstream-hikey' into armtf am: 1f3ebb070b ...android-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-cts-7.1_r18android-8.1.0_r9android-8.1.0_r81android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releasesecurity-oc-mr1-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releaseDmitry Shmidt2016-09-091-1/+3
|\
| * Merge remote-tracking branch 'aosp/upstream-hikey' into armtf am: 1f3ebb070b ...android-wear-o-preview-4android-wear-o-preview-3android-o-preview-4android-o-preview-3android-o-preview-2android-o-preview-1o-previewDmitry Shmidt2016-09-091-1/+3
| |\
| | * Merge remote-tracking branch 'aosp/upstream-hikey' into armtf am: 1f3ebb070bDmitry Shmidt2016-09-091-1/+3
| | |\
| | | * Merge remote-tracking branch 'aosp/upstream-hikey' into armtfDmitry Shmidt2016-09-091-1/+3
| | | |\
| | | | * Merge remote-tracking branch 'aosp/upstream-hikey' into armtfDmitry Shmidt2016-09-091-1/+3
| | | | |\
| | | | | * Merge pull request #7 from vishalbhoj/hikeyHaojian Zhuang2016-09-091-1/+3
| | | | | |\
| | | | | | * HiKey: usb: return bootloader version as 0.4Vishal Bhoj2016-09-081-1/+3
| | | | | |/
* | | | | | Merge remote-tracking branch 'aosp/upstream-hikey' into bugarm am: 09166485f7...Dmitry Shmidt2016-08-301-1/+1
|\| | | | |
| * | | | | Merge remote-tracking branch 'aosp/upstream-hikey' into bugarm am: 09166485f7...Dmitry Shmidt2016-08-301-1/+1
| |\| | | |
| | * | | | Merge remote-tracking branch 'aosp/upstream-hikey' into bugarm am: 09166485f7Dmitry Shmidt2016-08-301-1/+1
| | |\| | |
| | | * | | Merge remote-tracking branch 'aosp/upstream-hikey' into bugarmDmitry Shmidt2016-08-301-1/+1
| | | |\| |
| | | | * | Merge remote-tracking branch 'aosp/upstream-hikey' into bugarmDmitry Shmidt2016-08-301-1/+1
| | | | |\|
| | | | | * Merge pull request #6 from hzhuang1/product_nameHaojian Zhuang2016-08-301-1/+1
| | | | | |\
| | | | | | * hikey: Change product response to "hikey"Dmitry Shmidt2016-08-301-1/+1
| | | | | |/
* | | | | | Merge remote-tracking branch 'aosp/upstream-hikey' into bugarm am: f407facf97...Dmitry Shmidt2016-08-261-3/+44
|\| | | | |
| * | | | | Merge remote-tracking branch 'aosp/upstream-hikey' into bugarm am: f407facf97...Dmitry Shmidt2016-08-261-3/+44
| |\| | | |
| | * | | | Merge remote-tracking branch 'aosp/upstream-hikey' into bugarm am: f407facf97Dmitry Shmidt2016-08-261-3/+44
| | |\| | |
| | | * | | Merge remote-tracking branch 'aosp/upstream-hikey' into bugarmDmitry Shmidt2016-08-261-3/+44
| | | |\| |
| | | | * | Merge remote-tracking branch 'aosp/upstream-hikey' into bugarmDmitry Shmidt2016-08-261-3/+44
| | | |/| | | | | | |/
| | | | * Merge pull request #5 from vishalbhoj/hikeyHaojian Zhuang2016-08-261-3/+44
| | | | |\
| | | | | * hikey: usb: (Hack) return true for erase commandVishal Bhoj2016-08-261-0/+4
| | | | | * hikey: usb: support more variables in getvar commandVishal Bhoj2016-08-261-3/+40
| | | | |/
* | | | | Merge remote-tracking branch \\\\'aosp/upstream-hikey\\\\' into bugarm am: 6c...Dmitry Shmidt2016-07-261-3/+49
|\| | | |
| * | | | Merge remote-tracking branch \\\'aosp/upstream-hikey\\\' into bugarm am: 6c60...Haojian Zhuang2016-07-251-3/+49
|/| | | | | |/ / /
| * / / Merge remote-tracking branch \\'aosp/upstream-hikey\\' into bugarm am: 6c6021...Dmitry Shmidt2016-07-251-3/+49
|/| | | | |/ /
| * | Merge remote-tracking branch \'aosp/upstream-hikey\' into bugarmHaojian Zhuang2016-07-251-3/+49
|/| |
| * | Merge remote-tracking branch 'aosp/upstream-hikey' into bugarmDmitry Shmidt2016-07-211-3/+49
|/| | | |/
| * Merge pull request #4 from 96boards-hikey/working-hikey-system-off-rebootHaojian Zhuang2016-06-151-3/+35
| |\
| | * hikey: psci: reset board if Jumper1-2 is mountedGuodong Xu2016-06-151-3/+35
| |/
| * Merge pull request #3 from 96boards-hikey/working-hikey-system-off-bug-180Haojian Zhuang2016-06-141-4/+18
|/|
| * hikey: psci: bug fix of SYSTEM_OFFGuodong Xu2016-06-141-4/+18
* | Merge pull request #2 from vishalbhoj/hikeyandroid-wear-7.1.1_r1android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Haojian Zhuang2016-05-141-1/+1
|\|
| * set compiler fno-pic explicitlyVishal Bhoj2016-05-031-1/+1
|/
* Merge pull request #1 from linaro-swg/hikey_gendrvHaojian Zhuang2016-03-231-5/+12
|\
| * opteed: forward x4-x6 to OP-TEEJens Wiklander2016-01-281-5/+12
|/
* Merge pull request #62 from johnstultz-work/hikeyHaojian Zhuang2016-01-121-0/+6
|\
| * arm-trusted-firmware: Fixup fastboot getvar hang on unknown variableJohn Stultz2016-01-071-0/+6
|/
* Merge pull request #61 from hzhuang1/init_edmacHaojian Zhuang2015-11-262-0/+20
|\
| * hikey: init edmacHaojian Zhuang2015-11-262-0/+20
* | Merge pull request #60 from hzhuang1/add_fastboot_rebootHaojian Zhuang2015-11-241-1/+11
|\|
| * hikey: fastboot: support reboot commandHaojian Zhuang2015-11-241-1/+11
|/
* Merge pull request #59 from hzhuang1/fix_pentry_64bitFathi Boudra2015-11-233-10/+11
|\
| * hikey: fix the partition entry sizeHaojian Zhuang2015-11-233-10/+11
* | Merge pull request #58 from hzhuang1/disable_led_in_exceptionHaojian Zhuang2015-10-271-0/+2
|\|
| * hikey: disable led when exception occursHaojian Zhuang2015-10-271-0/+2
* | Merge pull request #57 from hzhuang1/ledHaojian Zhuang2015-10-273-4/+67
|\|
| * hikey: control user led by fastbootHaojian Zhuang2015-10-271-0/+17
| * hikey: change sn by assigned valueHaojian Zhuang2015-10-273-4/+50
|/
* Merge pull request #56 from hzhuang1/fix_platform_mkHaojian Zhuang2015-10-211-0/+1
|\
| * hikey: fix build issue missing gpioHaojian Zhuang2015-10-211-0/+1
|/