summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-01-27hikey960: Enabling dynamic partitions for HiKey960 am: 6d0db31172 am: ↵John Stultz
9c6767a79f am: fbf053749a Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1546260 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic72127711fd56059011102d398cefec4b6a84b88
2021-01-27Merge "Revert "Remove device/google/atv/overlay"" am: 537992a84e am: ↵Robin Lee
9b3522d37b am: bff63a4dee Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1559776 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I35ee531f1749296b51d3ecba8c4750e2755dc66c
2021-01-26hikey960: Update ptable to use super instead of system label am: ff6455e7af ↵John Stultz
am: a4959d9c61 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1549017 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3e63995fa1b26a942e5f1254e23a85a8e9afebc8
2021-01-26hikey960: Enable Virt-A/B on HiKey960 am: fb375231fc am: 2dfc506207John Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1549236 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I56e090b8d2f28429866d9e3c11c10d4cbc14bde2
2021-01-26hikey960: Enabling dynamic partitions for HiKey960 am: 6d0db31172 am: 9c6767a79fJohn Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1546260 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia70ecb8a8d3bfdc6b8ac65ba180484805a17e8f9
2021-01-26Merge "Revert "Remove device/google/atv/overlay"" am: 537992a84e am: 9b3522d37bRobin Lee
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1559776 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I66ceed78a8fed2e4ac8e9065ebf6429ce93dd2d1
2021-01-26hikey960: Update ptable to use super instead of system label am: ff6455e7afJohn Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1549017 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I36f1b0aa57dbe8eb0198ef5f72ff9f219cd9f45c
2021-01-26hikey960: Enable Virt-A/B on HiKey960 am: fb375231fcJohn Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1549236 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6d4ae2367357cea504dafb58cd0a37e7eb8fd74e
2021-01-26hikey960: Enabling dynamic partitions for HiKey960 am: 6d0db31172John Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1546260 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I660e427ad222698184d100a84ed71119ed7199cd
2021-01-26hikey960: Update ptable to use super instead of system labelJohn Stultz
This updates the ptable to use the super label instead of system to avoid using more fragile retrofit options in the build. Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: Ic57287d7cfd2d6bfa54f3a848d07dc1b858a3810
2021-01-26hikey960: Enable Virt-A/B on HiKey960John Stultz
Following again in Amit's footsteps, this implements virtual A/B in the same fashion as Amit's patch for db845c: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1547736 As the bootloader doesn't support the slot_suffix, we fix it to _a statically in the boot args. Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I80079d8eeb2635fece1f0f5f24eeaeff3a1c53db
2021-01-26hikey960: Enabling dynamic partitions for HiKey960John Stultz
This is basically a port of work Amit had done against HiKey board awhile back: https://android-review.linaro.org/c/device/linaro/hikey/+/20550 Moving system vendor product and system_ext to the super partition. For now, instead of reworking the ptable, we simply flash the super partition to the system partition. This will need to change so that we change the ptable as well, but that needs some time as the ptable flashing can be disruptive for testing. Feedback would be appreciated. Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: Ie53fed6392116b16063f497978e369490a1fccd2
2021-01-26Merge "Remove device/google/atv/overlay" am: bdb1cecf57 am: e026aedc6c am: ↵Robin Lee
8943126049 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1506157 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idc56ad353eff50308dfc58809cfc2eb7063f9387
2021-01-26Merge "Remove device/google/atv/overlay" am: bdb1cecf57 am: e026aedc6cRobin Lee
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1506157 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic573c7b77de4b3619189b35f05183356b17abc47
2021-01-25Merge "Revert "Remove device/google/atv/overlay"" am: 537992a84eRobin Lee
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1559776 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6b79f71ce9ee4cfc583403a4e3c98bc0c24934ce
2021-01-25Merge "Revert "Remove device/google/atv/overlay""Robin Lee
2021-01-25Revert "Remove device/google/atv/overlay"Robin Lee
Revert "Remove device/google/atv overlay from RRO exclusion" Revert submission 1510032-atv-rro Reason for revert: b/178396156 Reverted Changes: If9a99f850:Move keyguard enabled to Component Override I1b0056b50:Make device/google/atv compatible with RRO If766a0152:Remove device/google/atv overlay from RRO exclusio... I9df2747d9:Remove device/google/atv/overlay If689c72c2:Move device/google/atv overlays into SystemUI Change-Id: I02e0121367b114927435e0e3310df75a16ef9fb7
2021-01-25Merge "Remove device/google/atv/overlay" am: bdb1cecf57Robin Lee
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1506157 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8868ed831b5352343bcdf4ea65474b0b0c6f9c30
2021-01-25Merge "Remove device/google/atv/overlay"Robin Lee
2021-01-21Remove sensors. from vendor_property_contexts am: 03d24ac3f8 am: 8cc4daffdb ↵Inseob Kim
am: 3f2de8e857 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1554005 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2921edfa7d40b04c51d6b4160dbfbb3f80cb0ffc
2021-01-21Remove sensors. from vendor_property_contexts am: 03d24ac3f8 am: 8cc4daffdbInseob Kim
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1554005 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I012546097691a4303f9f7a941ab474182f47cfb0
2021-01-21Remove sensors. from vendor_property_contexts am: 03d24ac3f8Inseob Kim
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1554005 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8e400a9aa227e9d91da65a8aaf438244838deec7
2021-01-21Remove sensors. from vendor_property_contextsInseob Kim
This property is not used anymore. Bug: 177049853 Test: build Change-Id: I5258a6a552c121fd59420a635e0c75e33b1c60f9
2021-01-08hikey960: Make sure we load the system_heap.ko early am: 4ab665ef89 am: ↵John Stultz
af485637e2 am: 4f896b5354 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1543710 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I297c6671460f961528a1d0aa198c0fda18b17295
2021-01-08hikey960: Make sure we load the system_heap.ko early am: 4ab665ef89 am: ↵John Stultz
af485637e2 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1543710 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I203d15ff73a4917fe3728bc94f356263a78dfc46
2021-01-08hikey960: Make sure we load the system_heap.ko early am: 4ab665ef89John Stultz
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1543710 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icba38e2e1b949ea1608b9183894a4fc63897775e
2021-01-08hikey960: Make sure we load the system_heap.ko earlyJohn Stultz
In order to boot properly we need to manually load the system_heap.ko module in order for the dmabuf system heap to be present for gralloc and the codec2 uses. So add a line like we have for the CMA heap for this. Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I70172488c3b76baec27b0ea09b1779a02037ed17
2020-12-29Remove device/google/atv/overlayRobin Lee
This is replaced by individual RROs in atv_base.mk Bug: 173138807 Change-Id: I9df2747d9974f15c7a95654d82df817011ee04a5
2020-12-21Give the DMA-BUF CMA heap its own label am: 7e8a630293 am: acd954d41b am: ↵Hridya Valsaraju
3f8f990e61 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1530576 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iaa2facbbbfb66466f61be80f17f3c7b66f133e28
2020-12-21Give the DMA-BUF CMA heap its own label am: 7e8a630293 am: acd954d41bHridya Valsaraju
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1530576 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I26b1558a55c190b1d47b5f65a6ef33c92fce0127
2020-12-21Give the DMA-BUF CMA heap its own label am: 7e8a630293Hridya Valsaraju
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1530576 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I380a445898739047c34c3a55ef4fb872c90a65d0
2020-12-15Give the DMA-BUF CMA heap its own labelHridya Valsaraju
Currently, it is labelled as graphics_device. This patch creates a new type for it with attribute dmabuf_heap_device_type. Test: build Change-Id: I8456b28f6b3a6eb202431926163c70c66d22347c
2020-12-03Merge "hikey/hikey960: support to specify the prebuilt kernel dir out of ↵Treehugger Robot
aosp tree" am: 4dca84db28 am: 54813f6269 am: c0345b8683 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1508145 Change-Id: Ibcaf0940d568293e9966a3659d2f28c3027263a3
2020-12-03Merge "hikey/hikey960: support to specify the prebuilt kernel dir out of ↵Treehugger Robot
aosp tree" am: 4dca84db28 am: 54813f6269 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1508145 Change-Id: I2e3b8eed08316fcd7534c680961f597149977eff
2020-12-03Merge "hikey/hikey960: support to specify the prebuilt kernel dir out of ↵Treehugger Robot
aosp tree" am: 4dca84db28 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1508145 Change-Id: Ie4ff21141946af3fa16b6373666da862fec256a7
2020-12-03Merge "hikey/hikey960: support to specify the prebuilt kernel dir out of ↵Treehugger Robot
aosp tree"
2020-11-28Merge "hikey.mk/hikey960.mk: add support for android-mainline kernel" am: ↵Treehugger Robot
d90872832e am: d1d0203a85 am: a5a5509042 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1509788 Change-Id: Ic83a37489ef50330b71d8c62cdca7847eae57dfb
2020-11-27Merge "hikey.mk/hikey960.mk: add support for android-mainline kernel" am: ↵Treehugger Robot
d90872832e am: d1d0203a85 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1509788 Change-Id: Ib80e15efa3dc9fd93154a10ba89f6184e0cd18b4
2020-11-27Merge "hikey.mk/hikey960.mk: add support for android-mainline kernel" am: ↵Treehugger Robot
d90872832e Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1509788 Change-Id: Ibffbf44da1204099a2513441158aff6833f53638
2020-11-27Merge "hikey.mk/hikey960.mk: add support for android-mainline kernel"Treehugger Robot
2020-11-25Merge "Fix ifdef, its operand is literal variable name" am: 469c229565 am: ↵Treehugger Robot
d37bfbeeb5 am: 0558051d3e Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1509509 Change-Id: I76d9da7a0d33f2ac04839cd93b88ad27fcda94a7
2020-11-25Merge "Fix ifdef, its operand is literal variable name" am: 469c229565 am: ↵Treehugger Robot
d37bfbeeb5 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1509509 Change-Id: I8349f4a9f338d3f971950cfadea0fd085942e3ff
2020-11-25Merge "Fix ifdef, its operand is literal variable name" am: 469c229565Treehugger Robot
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1509509 Change-Id: Icc0c91262853184cc580a41a9fa50af56e7533b6
2020-11-25Merge "Fix ifdef, its operand is literal variable name"Treehugger Robot
2020-11-24hikey/hikey960: init.common.usb.rc: Add setprop sys.usb.controller to avoid ↵Yongqin Liu
picking the dummy hcd am: 339a268ed9 am: c33201b904 am: e7d7190829 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1425648 Change-Id: I1da7f0eb26f49724dba6c032e509bd36116bbad2
2020-11-24hikey/hikey960: init.common.usb.rc: Add setprop sys.usb.controller to avoid ↵Yongqin Liu
picking the dummy hcd am: 339a268ed9 am: c33201b904 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1425648 Change-Id: I9f1ff25c8e6c0956d7a92484d0df67bbe0012bd0
2020-11-24hikey/hikey960: init.common.usb.rc: Add setprop sys.usb.controller to avoid ↵Yongqin Liu
picking the dummy hcd am: 339a268ed9 Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1425648 Change-Id: Ied936572f834196c35e6be33ba421e4d2b300a30
2020-11-24hikey/hikey960: init.common.usb.rc: Add setprop sys.usb.controller to avoid ↵Yongqin Liu
picking the dummy hcd With some kernels that neable DUMMY_USB_HCD, we end up with multiple UDC devices, and the system might pick the dummy one to use which causes adb to fail. This corrects this by setting the sys.usb.controller property to the hikey/hikey960 controller name. Test: adb connection works with android11-5.4 kernel for hikey/hikey960 Change-Id: Ife99b9b16204cfe767c8b755ec5208ce5047c211 Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
2020-11-24hikey.mk/hikey960.mk: add support for android-mainline kernelYongqin Liu
where cma_heap.ko is used instead of ion_cma_heap.ko, and other ko files that not exist with the android-mainline kernel Test: boot to home screen with mainline kernel Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: I8c737d3f1cdb037e301af9bef151a67e5e4f4e8f
2020-11-24hikey/hikey960: support to specify the prebuilt kernel dir out of aosp treeYongqin Liu
add LOCAL_KERNEL_HOME variable to support the use of out of aosp tree prebuilt kernel dir, like the dist directory when building kernel according to the instructions here[1]. [1]: https://source.android.com/setup/build/building-kernels Test: export LOCAL_KERNEL_HOME=<out/hikey960/dist> export TARGET_KERNEL_USE=5.4 source build/envsetup.sh; lunch hikey960-userdebug; make -j$(nproc) droidcore export LOCAL_KERNEL_HOME=<out/hikey/dist> export HIKEY_USES_GKI=true source build/envsetup.sh; lunch hikey-userdebug; make -j$(nproc) droidcore Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org> Change-Id: Ide62267aa7b51d43280b4d3cefa0cbc82295b0d7