aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 70378c6d...android-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-devDmitry Shmidt2018-02-011-2/+2
|\
| * Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 70378c6da6Dmitry Shmidt2018-02-011-2/+2
| |\
| | * Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppDmitry Shmidt2018-02-011-2/+2
| | |\
| | | * Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppandroid-p-preview-1android-o-mr1-iot-preview-7o-mr1-iot-preview-7Dmitry Shmidt2018-01-311-2/+2
| | | |\
| | | | * Merge pull request #84 from hzhuang1/no_earlycon_2Haojian Zhuang2018-01-251-2/+2
| | | | |\
| | | | | * Platform/HiKey960: remove earlycon parameterHaojian Zhuang2018-01-251-2/+2
| | | | |/
* | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 2e219321...Dmitry Shmidt2018-01-175-9/+44
|\| | | |
| * | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: 2e21932172Dmitry Shmidt2018-01-175-9/+44
| |\| | |
| | * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppDmitry Shmidt2018-01-175-9/+44
| | |\| |
| | | * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppandroid-wear-8.0.0_r1Dmitry Shmidt2018-01-175-9/+44
| | |/| | | | | |/
| | | * Merge pull request #75 from shawnguo2/fix-mmcHaojian Zhuang2018-01-092-2/+2
| | | |\
| | | | * Drivers/DwMmcHcDxe: fix base clock frequency unit in DumpCapabilityRegShawn Guo2017-12-171-1/+1
| | | | * Drivers/DwMmcHcDxe: increase timeout for eMMC CMD1Shawn Guo2017-12-171-1/+1
| | | * | Merge pull request #79 from hzhuang1/gzip_2Haojian Zhuang2017-12-272-3/+10
| | | |\ \
| | | | * | Platforms/HiKey960: support gzip compressed kernel imageHaojian Zhuang2017-12-272-3/+10
| | | |/ /
| | | * | Merge pull request #77 from hzhuang1/testing/ptable_2Haojian Zhuang2017-12-211-4/+32
| | | |\ \ | | | | |/ | | | |/|
| | | | * Platforms/HiKey: make compatible with old ptableHaojian Zhuang2017-12-211-4/+32
| | | |/
* | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: b1f857f4...Dmitry Shmidt2017-11-296-43/+91
|\| | |
| * | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: b1f857f47dDmitry Shmidt2017-11-296-43/+91
| |\| |
| | * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppDmitry Shmidt2017-11-296-43/+91
| | |\ \
| | | * | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppandroid-o-mr1-iot-preview-6o-mr1-iot-preview-6Dmitry Shmidt2017-11-286-43/+91
| | | |\|
| | | | * Merge pull request #74 from hzhuang1/sd_2Haojian Zhuang2017-11-255-40/+53
| | | | |\
| | | | | * Drivers/DwMmcHcDxe: remove CMD5 in initializationHaojian Zhuang2017-11-251-11/+2
| | | | | * Drivers/DwMmcHcDxe: use fifoHaojian Zhuang2017-11-252-27/+49
| | | | | * Platforms/HiKey: fix the SD device pathHaojian Zhuang2017-11-252-2/+2
| | | | |/
| | | | * Merge pull request #71 from hzhuang1/fix_usbHaojian Zhuang2017-11-101-3/+38
| | | | |\
| | | | | * Drivers/DwUsb3Dxe: hack an interface for usb transmission sizeHaojian Zhuang2017-11-101-3/+38
* | | | | | 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 'b2f632a60b13e2db76f58d1abef592e40612f0f2' into HEADXin Li2017-11-130-0/+0
| | |\ \ \ \
* | | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: a27b8a12...Dmitry Shmidt2017-11-09859-33263/+155789
|\| | | | | |
| * | | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into opp am: a27b8a12b6Dmitry Shmidt2017-11-09859-33263/+155789
| |\| | | | |
| | * | | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppDmitry Shmidt2017-11-09859-33263/+155789
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge remote-tracking branch 'aosp/upstream-hikey-aosp' into oppDmitry Shmidt2017-11-09859-33263/+155789
| | |/| | | | | | | | |/ / | | | |/| |
| | | * | | Merge pull request #68 from johnstultz-work/bootloader-updateHaojian Zhuang2017-11-09859-33263/+155789
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Merge commit '460637eb3eacc7056830cedc5e85806ee9384f73' into bootloader-updateJohn Stultz2017-11-081-2/+3
| | | | |\ \
| | | | | * \ Merge pull request #67 from hzhuang1/block_sizeHaojian Zhuang2017-11-081-2/+3
| | | | | |\ \
| | | | | | * | Platforms/HiKeyFastbootDxe: fix block size to 4KBHaojian Zhuang2017-11-081-2/+3
| | | | | |/ /
| | | | * | | Merge commit 'cbf313400bbb5e82c00159ca2266a7cd18023d81' into bootloader-updateJohn Stultz2017-11-079-16/+20
| | | | |\| |
| | | | | * | Merge pull request #66 from hzhuang1/usb_speedHaojian Zhuang2017-11-071-1/+1
| | | | | |\ \
| | | | | | * | Drivers/DwUsb3Dxe: increate data buffer from 512B to 128KBHaojian Zhuang2017-11-071-1/+1
| | | | | * | | Merge pull request #64 from hzhuang1/boot_timeoutHaojian Zhuang2017-11-072-2/+3
| | | | | |\| |
| | | | | | * | Platforms/Hisilicon: decrease the boot timeout from 10s to 1sHaojian Zhuang2017-11-072-2/+3
| | | | | |/ /
| | | | | * | Merge pull request #62 from hzhuang1/sync_lpm3Haojian Zhuang2017-10-281-0/+0
| | | | | |\ \
| | | | | | * | Platforms/HiKey960: sync lpm3 imageHaojian Zhuang2017-10-281-0/+0
| | | | | |/ /
| | | | | * | Merge pull request #61 from hzhuang1/enable_fpll0Haojian Zhuang2017-10-285-13/+16
| | | | | |\ \
| | | | | | * | Platforms/HiKey960: fix to enable FPLL0Haojian Zhuang2017-10-282-0/+8
| | | | | | * | Drivers/DwMmcHcDxe: fix CMD parameters in both R1b and R7Haojian Zhuang2017-10-261-4/+2
| | | | | | * | Drivers/DwMmcHcDxe: fix the timing of fetching CSDHaojian Zhuang2017-10-252-9/+6
| | | | * | | | Merge branch 'github/hikey960_v1.3.4/update' into update-bootloaderJohn Stultz2017-10-30859-33263/+155784
| | | |/| | | | | | |/| |/ / /