summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-22hikey960: Switch default flash-all to use the UEFI bootloader. am: ↵android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-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_r12android12L-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-releaseJohn Stultz
7f18a5391f am: d6c0e0409d am: 2aed91067f am: fecf1d099d Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1665239 Change-Id: I021f869cee704e7fcbfd876db76a9ae3e4bb6826
2021-04-22hikey960: Switch default flash-all to use the UEFI bootloader. am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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-devandroid12-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-devJohn Stultz
7f18a5391f am: d6c0e0409d am: 2aed91067f Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1665239 Change-Id: I1fb6f4a5848d06ace61ba4904dd45b75a0d2f11f
2021-04-22hikey960: Switch default flash-all to use the UEFI bootloader. am: ↵John Stultz
7f18a5391f am: d6c0e0409d Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1665239 Change-Id: I6500ba53800cd1f6c3d95bcf31243d547ba7be10
2021-04-22hikey960: Switch default flash-all to use the UEFI bootloader. am: 7f18a5391fJohn Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1665239 Change-Id: If1a1738d823753dc951b261a3708fd3d41a18219
2021-04-06hikey960: Switch default flash-all to use the UEFI bootloader.android-s-beta-2android-s-beta-1John Stultz
Switch the flash-all.sh script to flash the UEFI bootloader, but for compatibility keep uefi-flash-all.sh (which just calls flash-all.sh), and move the old flash-all.sh script to legacy-flash-all.sh just in case folks find they need it. Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I20f686813e63ef6f0a2c5e09d444ceeaa87be65a
2021-03-30hikey960: Fixup the hisi-bootloader flashall script am: dea899234d am: ↵John Stultz
519225db35 am: a7dd4a6b87 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1646411 Change-Id: If9c9854b19774d66a51b74590ba410cbd54e6a48
2021-03-30hikey960: Update UEFI binaries (#113) to build to fix kerenl decompression ↵John Stultz
issue am: 697f4e2416 am: 8eb46bab01 am: e079266e81 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1633820 Change-Id: Ib8dfcbae45350414e57d41316be5d2162504b5c5
2021-03-30hikey960: Fixup the hisi-bootloader flashall script am: dea899234d am: ↵John Stultz
519225db35 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1646411 Change-Id: I2b5192432913c362a48b32c8b1b3e66a1234aaa5
2021-03-30hikey960: Update UEFI binaries (#113) to build to fix kerenl decompression ↵John Stultz
issue am: 697f4e2416 am: 8eb46bab01 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1633820 Change-Id: Ie0f9125bf58050d0628fc55d10f05cdf6caa57f8
2021-03-30hikey960: Fixup the hisi-bootloader flashall script am: dea899234dJohn Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1646411 Change-Id: I9ac48065612651bf2052009b19099c1cbc19f245
2021-03-30hikey960: Update UEFI binaries (#113) to build to fix kerenl decompression ↵John Stultz
issue am: 697f4e2416 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1633820 Change-Id: Ic8ef64ac5281e0eb8c4f51cf243084501d906ee1
2021-03-18Reserve space in super for dynamic partition metadata am: 452dff0580 am: ↵Tianjie
dacc9cc65c am: 0c8681fe74 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1646088 Change-Id: I2d610f72c4439b6bb33950f9cf147d3ffa8e7d3e
2021-03-18Reserve space in super for dynamic partition metadata am: 452dff0580 am: ↵Tianjie
dacc9cc65c Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1646088 Change-Id: I51858306678da6d7123596f95c40389f8add5591
2021-03-18hikey960: Fixup the hisi-bootloader flashall scriptJohn Stultz
I realized in some cases the cache partition in the hisi-bootloader doesn't play well with the fastboot format command, so add explicit format/size to get it to work more reliably. Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: Iccb0f3a497011fd523bea4947202c434855c9b9a
2021-03-18hikey960: Update UEFI binaries (#113) to build to fix kerenl decompression issueJohn Stultz
Newer GKI kernels have grown so that uncompressed they are larger then 32Megs. Unfortunately in UEFI the decompression buffer was only 32Megs, which resulted in the decompression overwriting other pages and corrupting the ramdisk. The following patch has been included to fix this issue: https://github.com/96boards-hikey/edk2/commit/53a99b7e4f39a4dcf5b6a828ee6a49be18c1b0ac Binaries from: https://snapshots.linaro.org/reference-platform/components/uefi-staging/113/hikey960/release/ Build Description: Build URL: https://ci.linaro.org/job/96boards-reference-uefi-staging/MX_PLATFORM=hikey960,MX_TYPE=RELEASE,label=docker-stretch-amd64/113/ UEFI Tools: https://git.linaro.org/uefi/uefi-tools.git UEFI Tools head: a47d7f8f4cc4a0ce63588ee3a89a3918f0f0751d EDK2: https://github.com/96boards-hikey/edk2.git EDK2 head: 9b543d48c0dd76f630d429a9436eee89971b8696 OpenPlatformPkg: https://github.com/96boards-hikey/OpenPlatformPkg.git OpenPlatformPkg branch: testing/hikey960_v1.3.4 OpenPlatformPkg head: 245344ea5421ba126e1eb76484d00b590a4a78f7 Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I6fbfc998a12bc1b9b8fbb3b7a0a254da43a75ff1
2021-03-18Reserve space in super for dynamic partition metadata am: 452dff0580Tianjie
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1646088 Change-Id: Idae1febaa4691419f97e491f2c7a91d46ff49ea8
2021-03-18Reserve space in super for dynamic partition metadataTianjie
The maximum size of all dynamic partition groups should not exceed the super size - DAP metadata size. Today the configuration of the device doesn't take the metadata into acount. Since we recommend 4M to partners, reserve 4M here. Bug: 182431975 Test: build Change-Id: I2feb06531bf0bbbff8845fa485b5b4917152bad6
2021-03-11Merge "hikey960: Switch system->super partition on hisi ptable as well." am: ↵Treehugger Robot
8811fd3ab2 am: ce3370c0dd am: 1214dffe7a Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1627281 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia6878f4e434ba981d2d9386405c1182f8ed454fa
2021-03-11Merge "hikey960: Switch system->super partition on hisi ptable as well." am: ↵Treehugger Robot
8811fd3ab2 am: ce3370c0dd Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1627281 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie8170bfe38e7c53dd171daf3274afb71a75df823
2021-03-11Merge "hikey960: Switch system->super partition on hisi ptable as well." am: ↵Treehugger Robot
8811fd3ab2 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1627281 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I650a102c54546da4070aa75f2313a7913288bdb4
2021-03-11Merge "hikey960: Switch system->super partition on hisi ptable as well."Treehugger Robot
2021-03-11hikey960: Switch system->super partition on hisi ptable as well.John Stultz
Dean Wheatley noted we did not also switch to using the super label on the hisi-ptable as well, causing flashing failures with the hisi bootloader. Unfortunately I don't have access to the tooling that generated this ptable, so I hand edited the binary to fix the label. Reported-by: Dean Wheatley <dwhea@dolby.com> Fixes: ff6455e7af90 ("hikey960: Update ptable to use super instead of system label") Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: Id478f88c53403772b311708b09814baecb67ab7c
2021-03-02hikey960: flash-all: Make sure to format cache partition am: 980b130852 am: ↵John Stultz
e35a6766f5 am: 0186a1e3b0 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1595517 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9b844e91da14a0189c43ea95f77b97704fb63eea
2021-03-02hikey960: Add /metadata support (reusing cache partition) am: e8fe717c88 am: ↵John Stultz
b754c17dea am: e97fb06202 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1584533 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib6579ebc9eba849f352e98a291699e04ed3e8548
2021-03-02hikey960: fstab.hikey960 Add new dynamic partitions to the vendor fstab am: ↵John Stultz
a8cd4d9637 am: ff985c9b93 am: 6317814f87 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1569522 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If63b0f126a6ac8aff1f6bbc368e008f66c4cd51e
2021-03-02hikey960: Add deferred-free-helper.ko and page_pool.ko to the ramdisk am: ↵John Stultz
aca358a133 am: 9d657df7da am: 99982c8e11 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1584535 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib8fee2d14dc8783dd22ba4b318874698ede7af37
2021-03-02hikey960: flash-all: Make sure to format cache partition am: 980b130852 am: ↵John Stultz
e35a6766f5 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1595517 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8b8d4d6af83fb7fbe2d03b24656c733089bf85b9
2021-03-02hikey960: Add /metadata support (reusing cache partition) am: e8fe717c88 am: ↵John Stultz
b754c17dea Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1584533 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaabf4e0c3b63e7d33db3fdff223792591fdee87c
2021-03-02hikey960: fstab.hikey960 Add new dynamic partitions to the vendor fstab am: ↵John Stultz
a8cd4d9637 am: ff985c9b93 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1569522 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id3b8e30ecccc1cdb10cd34494c60ab62a6e46909
2021-03-02hikey960: Add deferred-free-helper.ko and page_pool.ko to the ramdisk am: ↵John Stultz
aca358a133 am: 9d657df7da Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1584535 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I20702c65f504fb86e934fceaa73f38bd67f8cd11
2021-03-02hikey960: flash-all: Make sure to format cache partition am: 980b130852John Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1595517 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I11e5e8ac7c0228e93f4f948de5320924e23724fb
2021-03-02hikey960: Add /metadata support (reusing cache partition) am: e8fe717c88John Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1584533 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icbc4617d4231a2658b1ef52d2410b4d577f0548d
2021-03-02hikey960: fstab.hikey960 Add new dynamic partitions to the vendor fstab am: ↵John Stultz
a8cd4d9637 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1569522 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic5e4f6356a8aaa74a6c2069f5963ab631e277838
2021-03-02hikey960: Add deferred-free-helper.ko and page_pool.ko to the ramdisk am: ↵John Stultz
aca358a133 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1584535 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9abd2077254f0c48b78da51e009a0951a95dafff
2021-02-23hikey960: flash-all: Make sure to format cache partitionJohn Stultz
We are re-using the cache partition as /metadata, so make sure we format it when flashing to avoid quirks due to outdated data left behind on the metadata parititon. Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I03d254785f9f8d3fde49b0dc3e19e22c542fd0ea
2021-02-23hikey960: Add /metadata support (reusing cache partition)John Stultz
With dynamic partitions we need /metadata mounted to properly make 'adb remount' work. So this makes use of the unused cache partition to mount it as metadata (along with the needed build env values). With this patch 'adb remount' works. Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I33da79ec15b453dbdc3b8a3180863abeb67d4cb6
2021-02-23hikey960: fstab.hikey960 Add new dynamic partitions to the vendor fstabJohn Stultz
While we boot up properly with the dynamic partitions in only the ramdisk fstab, Yongqin noted adb remount was failing recently. On looking into the issue, I realized one issue is we don't have the dynamic paritions listed in the vendor fstab which causes some of the remount logic to not find the partitions. This patch adds the dynamic partitions and unifies the fstab file for hikey960 so we have the same one for both the ramdisk and vendor image. NOTE: adb remount still does not fully work with this change. We will need a follow on patch to fix that. Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: Idf9c463162398ef89db31fbf69d205d1a47e2cdd
2021-02-23hikey960: Add deferred-free-helper.ko and page_pool.ko to the ramdiskJohn Stultz
The new deferred-free-helper and page pool modules for dmabuf heaps are prerequisites for the system heap, so we need to include them in the initrd along with the system_heap.ko Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I0b3717ab1f1d5f9f87363af46e4059de46ae76a3
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ed77b1c24d -s ↵Xin Li
ours am: da9200a08e -s ours am skip reason: Change-Id I26b1558a55c190b1d47b5f65a6ef33c92fce0127 with SHA-1 3f8f990e61 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I59cb257f5fd4568ca1b44facc0b4a9cecd697170
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ed77b1c24d -s oursXin Li
am skip reason: Change-Id I26b1558a55c190b1d47b5f65a6ef33c92fce0127 with SHA-1 3f8f990e61 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2df7208f68674837836db8823472b5c360ee6bc7
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I26b1558a55c190b1d47b5f65a6ef33c92fce0127 Change-Id: Ia3c7dd8499516c9209e424945e70a0eb7bcb5cd0
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to device/linaro/hikey am: 61897684d5 am: ↵Bob Badour
abb3fbec8a am: 71b3738ca0 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1588970 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic2fc7e0791b8e7b439bd3866a46a53a2613a0ec0
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to device/linaro/hikey am: 61897684d5 am: ↵Bob Badour
abb3fbec8a Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1588970 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I25125f1ec4d4c8f35fedd5d2e7c6e0f24f0a228b
2021-02-15[LSC] Add LOCAL_LICENSE_KINDS to device/linaro/hikey am: 61897684d5Bob Badour
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1588970 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I343d2633e005416f1214d3fdd7e41cb80e310b43
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to device/linaro/hikeyandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: audio/Android.mk bluetooth/Android.bp hifi/debug-hifi/Android.mk libmemtrack/Android.mk mali/bifrost/Android.mk mali/utgard/Android.mk recovery/Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: power/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-MIT legacy_unencumbered to: Android.bp Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-GPL-2.0 to: gralloc/Android.bp gralloc/Android.mk gralloc960/Android.bp gralloc960/Android.mk Added SPDX-license-identifier-GPL-2.0 to: wpan/uim/Android.mk Added SPDX-license-identifier-MIT to: hifi/xaf/host-apf/Android.bp hifi/xaf/host-apf/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I5414686a8063382cbec9a7d8b125c2a55c68c474
2021-02-06hikey960: add super.img to update image am: fbd395ff6e am: 452c1ef3ed am: ↵Yongqin Liu
e98070a7e7 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1561518 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If12dda18ce8f89c327fa0c48b038730c2551eaf3
2021-02-06hikey960: add super.img to update image am: fbd395ff6e am: 452c1ef3edYongqin Liu
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1561518 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic09807bc9ce5767e8a9946d6d0ed588e5b8bf0b9
2021-02-06hikey960: add super.img to update image am: fbd395ff6eYongqin Liu
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1561518 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie101a8b6bf1416fe99219abdd0f475cb4cd32994
2021-01-27hikey960: add super.img to update imageYongqin Liu
super.img was not included in the update image and was therefore not visible to update tools Test: the super.img is in the hikey960-img-eng.xxx.zip file Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: I1e025c7ac57f4b6c88333ab47065d018afe2f4ee
2021-01-27hikey960: Update ptable to use super instead of system label am: ff6455e7af ↵John Stultz
am: a4959d9c61 am: 71949d8873 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1549017 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I10f74a0d61a74c03d017e32d9b610d39ec01d76a