summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e55c9aa7ff -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-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-devandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: 61b62a608b -s ours am skip reason: Change-Id I1fe9023e29d5b1e7d1dbb240fcf397a7010fbc4b with SHA-1 0a8ff1dbc4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5c42bd5c48ad79bc64967adb0baeecbfc810a5e3
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: e55c9aa7ff -s oursXin Li
am skip reason: Change-Id I1fe9023e29d5b1e7d1dbb240fcf397a7010fbc4b with SHA-1 0a8ff1dbc4 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia813f611810eca246d16c7c1b2bc57aee6969d3f
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: I1fe9023e29d5b1e7d1dbb240fcf397a7010fbc4b Change-Id: I1b406fa50a3dac307507e1f74e8e2fcafa5ec998
2021-02-19hikey-kernel: Update hikey960 android-5.4 kernel and modules am: 8c83a5ffda ↵John Stultz
am: d7933fe59c am: df063bb2bb Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1582276 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifc430f8b9d67988d11bd88f29ed81b37925d6740
2021-02-19hikey-kernel: Update hikey960 android-5.4 kernel and modules am: 8c83a5ffda ↵John Stultz
am: d7933fe59c Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1582276 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I53dc891fd928f2615fb21ebefaba594d9ec3bb5e
2021-02-19hikey-kernel: Update hikey960 android-5.4 kernel and modules am: 8c83a5ffdaJohn Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1582276 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4184c088355424ad418a58c9d292c9323faf8862
2021-02-10hikey-kernel: Update hikey960 android-5.4 kernel and modulesJohn Stultz
Update hikey960 kernel modules from: https://ci.android.com/builds/submitted/7134844/kernel_hikey960/latest/ Update GKI kernel Image from: https://ci.android.com/builds/submitted/7134844/kernel_aarch64/latest (Manually created Image.gz-dtb combining the GKI Image and hi3660-hikey960.dtb) Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I0b373e11e9b87eed905ff97dffa569167b3c1d76
2020-11-24Mark ab/6881855 as merged am: 482c9e833e am: 0a8ff1dbc4Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/hikey-kernel/+/13112085 Change-Id: Ib0155a3689bcd6f892c8e57ee257d07dcd70e6db
2020-11-24Mark ab/6881855 as merged am: 482c9e833eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/hikey-kernel/+/13112085 Change-Id: I1fe9023e29d5b1e7d1dbb240fcf397a7010fbc4b
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I25d60db041007403a0e035e4a0645d1a50b3ef0b
2020-11-17hikey-kernel: Update 4.14/4.19 kernels to d5dffd076ec6 for hikey am: ↵Yongqin Liu
cc19ab9f1d am: 12e69e8500 am: fd7344535d am: 450120c1c6 Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1498490 Change-Id: I7e767ffe44727678c8fd91d89b3c9a721d5a5f47
2020-11-16hikey-kernel: Update 4.14/4.19 kernels to d5dffd076ec6 for hikey am: ↵Yongqin Liu
cc19ab9f1d am: 12e69e8500 am: fd7344535d Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1498490 Change-Id: Ic71c6b602f45195645a3398d46c6da13e41a4887
2020-11-16hikey-kernel: Update 4.14/4.19 kernels to d5dffd076ec6 for hikey am: ↵Yongqin Liu
cc19ab9f1d am: 12e69e8500 Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1498490 Change-Id: Ie62b3f443b6a16b29c04a7c91d5a860472cf3d55
2020-11-16hikey-kernel: Update 4.14/4.19 kernels to d5dffd076ec6 for hikey am: cc19ab9f1dYongqin Liu
Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1498490 Change-Id: Ibceee8e6c93bdbadfa1b18b3d062546465e00dd8
2020-11-16hikey-kernel: Update 4.14/4.19 kernels to d5dffd076ec6 for hikeyYongqin Liu
Based on the 4.14 kernel commit d5dffd076ec6 ("hikey/hikey960 configs: remove variant of HIKEY_KERNEL_DIR"). https://android.googlesource.com/kernel/hikey-linaro/+/d5dffd076ec64892ecf96fcc9b1bef445d145b32 and the 4.19 kernel commit b0152212aa93 ("and Revert "ANDROID: Kbuild, LLVMLinux: allow overriding clang target triple") https://android.googlesource.com/kernel/hikey-linaro/+/b0152212aa93133a4b3b6f3dcf854564a95f57e2 which include Mali workaroud in the following link: https://android-review.googlesource.com/c/kernel/hikey-linaro/+/1441262 and new toolchain/KERNEL_DIR related changes from android-4.19-stable This patch updates the HiKey 4.19 kernel to the CI build here: https://ci.android.com/builds/submitted/6972652/kernel_hikey/latest and the HiKey 4.14 kernel to the CI build here: https://ci.android.com/builds/submitted/6971857/kernel_hikey/latest Test: boot to homescreen with hikey builds Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: I06cc30bfad45114832c1de41c1be28e41d259026
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3d22910089 -s ours am: ↵Xin Li
98b5e240eb -s ours am: a906675452 -s ours am skip reason: Change-Id I786a11712dd0f5139b8b69bff36c916a7a80b29f with SHA-1 f1bc609120 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/hikey-kernel/+/12797044 Change-Id: Iff68968212ddb3988cda902096469245359a026f
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3d22910089 -s ours am: ↵Xin Li
98b5e240eb -s ours am skip reason: Change-Id I786a11712dd0f5139b8b69bff36c916a7a80b29f with SHA-1 f1bc609120 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/hikey-kernel/+/12797044 Change-Id: Ibae67125d5ff8602c1ea0c4a2c97928baaebbb98
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3d22910089 -s oursXin Li
am skip reason: Change-Id I786a11712dd0f5139b8b69bff36c916a7a80b29f with SHA-1 f1bc609120 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/hikey-kernel/+/12797044 Change-Id: If35bb219ed9346cacd1aaeeabaf659f4ad6cd938
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I786a11712dd0f5139b8b69bff36c916a7a80b29f Change-Id: Idfbb8fbab29383691ab4ba1d34d1129d50c9000c
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 594ab4f027 -s ours am: ea1973d083 -s ours am: 724921c362 -s ours am: cfb152c905 -s ours am skip reason: Change-Id I670b163eede4bb60c197e2ded9491d45ad4b6541 with SHA-1 2ee513caf0 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/hikey-kernel/+/12469249 Change-Id: I0650cba5c862fb1b20d1380068c91b3cda1cd769
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 594ab4f027 -s ours am: ea1973d083 -s ours am: 724921c362 -s ours am skip reason: Change-Id I670b163eede4bb60c197e2ded9491d45ad4b6541 with SHA-1 2ee513caf0 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/hikey-kernel/+/12469249 Change-Id: I000bdf7b47debe464bee917a2b91d173e03ef7f9
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 594ab4f027 -s ours am: ea1973d083 -s ours am skip reason: Change-Id I670b163eede4bb60c197e2ded9491d45ad4b6541 with SHA-1 2ee513caf0 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/hikey-kernel/+/12469249 Change-Id: Ic4c6c3d502d5752c0e4458e5e5424299a512128e
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 594ab4f027 -s ours am skip reason: Change-Id I670b163eede4bb60c197e2ded9491d45ad4b6541 with SHA-1 2ee513caf0 is in history Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/hikey-kernel/+/12469249 Change-Id: Ia55ff68c0a924640e4cdb2968b179187ded46a44
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I670b163eede4bb60c197e2ded9491d45ad4b6541 Change-Id: I17d9409df815d08e2379f77a1088880c5bd3b6a2
2020-08-16hikey-kernel: Add missing syscon-reboot-mode.ko prebuilt module am: ↵John Stultz
ab24429a49 am: 2a5b7d6fc8 am: bcc36e3925 am: 1445363890 am: 581828ab58 Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1398791 Change-Id: I4945b12611859a9dd8754d7aaea9c2554524e1ed
2020-08-16hikey-kernel: Add missing syscon-reboot-mode.ko prebuilt module am: ↵John Stultz
ab24429a49 am: 2a5b7d6fc8 am: bcc36e3925 am: 1445363890 Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1398791 Change-Id: I3954b65763b7920d84072f98a5ecfc126431f948
2020-08-16hikey-kernel: Add missing syscon-reboot-mode.ko prebuilt module am: ↵John Stultz
ab24429a49 am: 2a5b7d6fc8 am: bcc36e3925 Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1398791 Change-Id: I4358890259dedb2204c4f52ace4def236826a6db
2020-08-16hikey-kernel: Add missing syscon-reboot-mode.ko prebuilt module am: ↵John Stultz
ab24429a49 am: 2a5b7d6fc8 Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1398791 Change-Id: I8ee64accf7aee3ca2329892a431282584817e6ed
2020-08-16hikey-kernel: Add missing syscon-reboot-mode.ko prebuilt module am: ab24429a49John Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1398791 Change-Id: I32e940d3fa9c78ca8a3ce099be574fcead80cfdc
2020-08-16hikey-kernel: Add missing syscon-reboot-mode.ko prebuilt moduleJohn Stultz
Apparently in the previous update, I somehow missed adding the syscon-reboot-mode.ko module, which only manifests as causing the adb reboot bootloader command to just trigger a normal reboot instead of going into fastboot mode. This patch fixes the issue by adding the missing prebuilt module. This module (along with the previous others) updated from: https://ci.android.com/builds/submitted/6732468/kernel_hikey960/latest Fixes: 7d517262be51 ("hikey-kernel: Update hikey960 android-5.4 kernel and modules") Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I4e4d82aa2b3cc555141d0aa2ad7a4ec5d42d9371
2020-08-04hikey-kernel: Update hikey960 android-5.4 kernel and modules am: 7d517262be ↵John Stultz
am: 962fc00bf5 am: 9a23c1c343 am: f1bc609120 am: 8d5bd62071 Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1387228 Change-Id: If085b2ec3d4b5e88146d5595f23e52a8124269d9
2020-08-04hikey-kernel: Update hikey960 android-5.4 kernel and modules am: 7d517262be ↵John Stultz
am: 962fc00bf5 am: 9a23c1c343 am: f1bc609120 Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1387228 Change-Id: I2ae39b7ce11cd01df6f1c70d99cf1c18ad23bf0b
2020-08-04hikey-kernel: Update hikey960 android-5.4 kernel and modules am: 7d517262be ↵John Stultz
am: 962fc00bf5 am: 9a23c1c343 Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1387228 Change-Id: I786a11712dd0f5139b8b69bff36c916a7a80b29f
2020-08-04hikey-kernel: Update hikey960 android-5.4 kernel and modules am: 7d517262be ↵John Stultz
am: 962fc00bf5 Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1387228 Change-Id: Ifc652b344c893b0d1463e6586b34d97c6eb85747
2020-08-04hikey-kernel: Update hikey960 android-5.4 kernel and modules am: 7d517262beJohn Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1387228 Change-Id: I66eed0739ea02b4cd34faea9271f04a8c9f4d6b9
2020-08-04hikey-kernel: Update hikey960 android-5.4 kernel and modulesJohn Stultz
hikey960 kernel modules updated from: https://ci.android.com/builds/submitted/6732468/kernel_hikey960/latest Updated GKI kernel image from: https://ci.android.com/builds/submitted/6732468/kernel_aarch64/latest This resolves a boot regression with the prebuilt kernels due to the ufs-hisi.ko no longer being included in the initrd due to it being built in on newer GKI kernels Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: Ifb0fb2771339bbf5a7e5ceb286c0e604764fa980
2020-06-11hikey-kernel: Add hikey960 android-5.4 kernel and modules am: 116a79898b am: ↵John Stultz
12b794bfdc am: 2ee513caf0 am: 098c762a91 am: e414162600 Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1324301 Change-Id: I37d13bad329083a5043e4cd6868caaaee304ff40
2020-06-11hikey-kernel: Reorganize prebuilt kernel directory am: 650d521ebf am: ↵John Stultz
11b1475093 am: aacd3751d4 am: f21464657d am: 72a9f8845d Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1324300 Change-Id: Ib7118de5e1dc50184cf44631c0ca6722418f8d91
2020-06-11hikey-kernel: Add hikey960 android-5.4 kernel and modules am: 116a79898b am: ↵John Stultz
12b794bfdc am: 2ee513caf0 am: 098c762a91 Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1324301 Change-Id: Ibf3c5ff32e653e626abdbd1bfaf936ced633a6d8
2020-06-11hikey-kernel: Reorganize prebuilt kernel directory am: 650d521ebf am: ↵John Stultz
11b1475093 am: aacd3751d4 am: f21464657d Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1324300 Change-Id: I846ff22d4a014e523d25d2cc1b9f5fea00f77d6f
2020-06-11hikey-kernel: Add hikey960 android-5.4 kernel and modules am: 116a79898b am: ↵John Stultz
12b794bfdc am: 2ee513caf0 Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1324301 Change-Id: I58d4178dbe792cb429792fcc61099a9b65b0c98a
2020-06-11hikey-kernel: Reorganize prebuilt kernel directory am: 650d521ebf am: ↵John Stultz
11b1475093 am: aacd3751d4 Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1324300 Change-Id: I60fe6b39f83ef022dda254f8c7b4f7d94b8a7a6e
2020-06-11hikey-kernel: Add hikey960 android-5.4 kernel and modules am: 116a79898b am: ↵John Stultz
12b794bfdc Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1324301 Change-Id: I670b163eede4bb60c197e2ded9491d45ad4b6541
2020-06-11hikey-kernel: Reorganize prebuilt kernel directory am: 650d521ebf am: 11b1475093John Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1324300 Change-Id: Ieca8cc3d72c00450bfebaab34d6157bbc38744dc
2020-06-11hikey-kernel: Add hikey960 android-5.4 kernel and modules am: 116a79898bJohn Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1324301 Change-Id: If26c81c50113c6517f36a17304d44abd556ff8e3
2020-06-11hikey-kernel: Reorganize prebuilt kernel directory am: 650d521ebfJohn Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey-kernel/+/1324300 Change-Id: I8e25a023ebead15ddac94cac7412c2811a7e8475
2020-06-09hikey-kernel: Add hikey960 android-5.4 kernel and modulesandroid-r-beta-3android-r-beta-2John Stultz
hikey960 kernel modules updated from: https://ci.android.com/builds/submitted/6560288/kernel_hikey960/latest Updated GKI kernel image from: https://ci.android.com/builds/submitted/6560288/kernel_aarch64/latest Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I468aaf95748e8cfc6a676c73e78ff3257c95fe2b
2020-06-09hikey-kernel: Reorganize prebuilt kernel directoryJohn Stultz
Switch to using <board>/<kernel ver>/<file> rather then <file>-<board>-<kernel ver> Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: Idc9d42578c77142b4b23616bde058d6781bbaaea
2020-04-28Merge "hikey-kernel: Update HiKey960/HiKey 4.19 kernel to 03a6248cae93" am: ↵Treehugger Robot
15d4959bce am: e59ddb4325 am: 770ba47c99 am: f2ec557c9f am: 24920a8e5c Change-Id: I7220d45c9ea912cb0049a7604c009c27b04daea9
2020-04-28Merge "hikey-kernel: Update HiKey960/HiKey 4.19 kernel to 03a6248cae93" am: ↵Treehugger Robot
15d4959bce am: e59ddb4325 am: 770ba47c99 am: f2ec557c9f Change-Id: I62827339db33e17d725a85e93d05b33ba549303a
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 04:18:26 +0000