summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-09-27Merge "hikey: Fix fstab.hikey-3.18 to not mount cache partition"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-releaseAlistair Strachan
2018-09-26hikey: Fix fstab.hikey-3.18 to not mount cache partitionJohn Stultz
This was missed in a previous commit removing the cache parition which is needed to support GSI Change-Id: I4e052b33ddd5d0d1924dbad2c67a3664b57777b6 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-09-24Merge "hikey960: hikey: add target for AOSP TV builds"Alistair Strachan
2018-09-21hikey960: hikey: add target for AOSP TV buildsSahaj Sarup
Changes: - Add a hikey960_tv-userdebug lunch target. - Add a hikey_tv-userdebug lunch target. - Use the TvSampleLeanbackLauncher to replace Launcher 3. - Removed navbar and notification bar. - Increased DPI to 260 - Added TvSetting to replace Settings - non tv targets remain unaffected. Minor Issue with AOSP TV: - WiFi connection UI doesn't have a "next" button. To be able to connect we have to use third-party apps - hikey boots to UI with kernel 4.4 or less Test: Builds and boots to Leanback Launcher UI Change-Id: I43fa609f486bfa71482b62bf36dff15bcd46647c Signed-off-by: Sahaj Sarup <sahaj.sarup@linaro.org>
2018-09-20hikey960: Audio DSP changes in prep for TrebleNiranjan Yadla
This patch provides hifi changes that are needed to work with FULL_TREBLE enabled. As /system/bin does not support write permissions moved dec-out.pcm file to /data/dec-out.pcm Copied dhifimesg to /vendor/bin in order to capture hifi dsp logs Bug: 116226155 Change-Id: Ia90f09760198b3fefe5ef3dfbdf5d7e11dd67a4b Originally-by: Niranjan Yadla <nyadla@cadence.com> Signed-off-by: Alistair Strachan <astrachan@google.com>
2018-09-12hikey/hikey960: Force navkeys on w/ GSI via qemu.hw.mainkeys=0John Stultz
It seems a bit odd, but when booting with a GSI build, there are no navigation keys. Looking at the code, it seems the qemu.hw.mainkeys property can be used to force it, and other devices like marlin use this as well. Many thanks to Vishal Bhoj for helping find/validate this. Change-Id: I15c625b51a9c9f7d71825e7f2685d4362e57ca82 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-09-12hikey{,960}: Remove cache partition supportvishal
This does not work with latest GSI on AOSP master which has cache as a symlink to /data/cache where trying to mount cache partition fails. Change-Id: I0621accc580a5ae8ccf2494a76df457f152d51e3 Signed-off-by: Vishal Bohj <vishal.bhoj@linaro.org>
2018-09-09Merge "Change memlock rlimit to support eBPF feature"Treehugger Robot
2018-09-07Change memlock rlimit to support eBPF featureChenbo Feng
The eBPF trafficController in netd need as least 8MB memlock rlimit to run properly due to the size of eBPF maps. To make this feature avalaible on hikey, the rlimit is set to 8MB for all processes. Bug: 70945407 Bug: 79938294 Test: dumpsys netd trafficcontroller doesn't show errors Change-Id: Ie0b4ceb889a838dd5b0ddb1630d28811f6ddc983
2018-09-06hikey960: bifrost: Enable renderscript binariesJohn Stultz
Re-add the renderscript binaries to the build and add sepolicy and manifest changes needed to support ARM's renderscript library. Change-Id: I743ffe93a4e41d73122dc0d2a1ad8eb962597649 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-09-06hikey960: bifrost: Add renderscript binary dependenciesJohn Stultz
This patch adds prebuilt binary/libraries needed by the mali renderscript code. Following the renderscript integration instructions in the release notes from the binary blob package here: https://developer.arm.com/products/software/mali-drivers/user-space Specifically: https://developer.arm.com/-/media/Files/downloads/mali-drivers/user-space/HiKey%20960/mali-G71_r10p0-01rel1_android-8.1_1.tar.gz?revision=56403097-18f0-4ea2-9ff8-de7044b71e5e These were built by repo sync'ing Android-8.1, and building: OVERRIDE_RS_DRIVER=libRSDriverArm.so make libclcore.bc libclcore_neon.bc libbcc libLLVM bcc Then the resulting binaries were copied from the system dir to here. Change-Id: Ife139a20c2a9aa1727de0668ba85309d9b09920f Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-09-06hikey960: bifrost: Update mali bifrost blobs to r10p0John Stultz
Update the mali blobs to the r10p0 binary blobs from https://developer.arm.com/products/software/mali-drivers/user-space Specifically: https://developer.arm.com/-/media/Files/downloads/mali-drivers/user-space/HiKey%20960/mali-G71_r10p0-01rel1_android-8.1_1.tar.gz?revision=56403097-18f0-4ea2-9ff8-de7044b71e5e NOTE: This change should not land until pre-built binaries that include the r10p0 kernel driver have been merged, as these blobs do not function with the r9p0 kernel driver. Change-Id: Ic1fa1a64108e0856f578144ea54527ea3d556944 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-09-05hikey: Enable drm_hwcomposer on 4.9 kernelsJohn Stultz
Enable drm_hwcomposer on hikey for 4.9 kernels Note: This patch will have to be merged in lockstep with a prebuilt kernel update that includes the following commits: https://android-review.googlesource.com/c/kernel/hikey-linaro/+/748309 Change-Id: I85644529527c37048dec6d38f159e5adf09ccef2 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-09-05hikey/hikey960: Enable drm_hwcomposer for 4.14+ kernelsJohn Stultz
Modifications needed to enable the drm_hwcomposer in the hikey build. This enables drm_hwcomposer for 4.14+ on HiKey and HiKey960 This requires updated drm_hwc source and changes to the kernel source and 4.14 kernel prebuilt to be updated (and merged together with this change). So DO NOT MERGE until pre-built kernel which incldues the following commits is submitted: https://android-review.googlesource.com/c/kernel/hikey-linaro/+/743923 As well as the following update to drm_hwcomposer: https://android-review.googlesource.com/c/platform/external/drm_hwcomposer/+/743902 Bug: 62066689 Change-Id: Ifbe76eed77672d06ceb3bce16de4b4d8cac56f17 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-08-22hikey: installer: Update UEFI binaries (no-initrd-abootimg support)android-o-mr1-iot-release-1.0.4John Stultz
This updates the UEFI binaries to match the current ARMTF/UEFI sources Notable changes: * EmbeddedPkg/AbootimgLib: fix unused Status variable * EmbeddedPkg/AbootimgLib: make initrd kernel parameter flexible * BaseTools/tools_def: add "-fno-unwind-tables" to GCC_AARCH64_CC_FLAGS * MdeModulePkg/UfsPassThruDxe: use loop to polling UTRLRSR * MdeModulePkg/UfsPassThruDxe: avoid ufs hang by adding delay * Revert "EmbeddedPkg/AndroidFastboot: add delay before reboot" * Drivers/DwUsbDxe: fix hang in fastboot boot command * Platforms/HiKey960: Support 4G or more memory space for RAM * Platforms/HiKey960Dxe: check whether reboot reason updated * Platforms/HiKey960Dxe: check flag before clearing virtual key Built from the following trees: https://android.googlesource.com/device/linaro/bootloader/arm-trusted-firmware b23f5fb1ac2033077c7204f604b2c74649b0e9a3 https://android.googlesource.com/device/linaro/bootloader/edk2 a1e5dccd6adf4509868368f57e2df956dff880df https://android.googlesource.com/device/linaro/bootloader/OpenPlatformPkg d0905e0b2cd935e61c3945ac179112f702fa866b Signed-off-by: John Stultz <john.stultz@linaro.org> Change-Id: I7462dddb2105a60d7605cfa31cc7568d4c34c969
2018-08-16Merge "HiKey960: Add sys.usb.controller override for newer kernels"Treehugger Robot
2018-08-15HiKey960: Add sys.usb.controller override for newer kernelsJohn Stultz
From: Yu Chen <chenyu56@huawei.com> With the usb rework going on against mainline kernels, Android sometimes gets confused as to which device to use for usb-gadget functionality. Thus this adds: PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.usb.controller=ff100000.dwc3 To make sure the right device is selected. Without this, if we boot using host mode and then plug in the gadget connection, the system will not setup the gadget device and adb will not function. Additionally, this should not have any side-effects on older kernels. Yu Chen clarifies: the property of "sys.usb.controller" should always be "ff100000.dwc3" on hikey960. Previously we did not use the code from drivers/usb/dwc3/drd.c to handle the data-role-switch" in our older code, and the dwc3 udc always exists in "/sys/class/udc" in older kernels. Change-Id: Ic21da64ab1b7cba452ca0ec9580ba90ca59f5d0c Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-08-15hikey960: Update UEFI bootloader binaries to build #76John Stultz
This updates the UEFI bootloader binaries to the latest build, which addresses issues w/ abootimg files that do not have initrds Binaries are from the following build: http://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/76/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/76/ UEFI Tools: https://git.linaro.org/uefi/uefi-tools.git UEFI Tools head: c0ed79c3d7cde255d49afbf8a475a36db0c042f8 EDK2: https://github.com/96boards-hikey/edk2.git EDK2 head: dcea3943b2be432662db3b68903db0d7f7362615 OpenPlatformPkg: https://github.com/96boards-hikey/OpenPlatformPkg.git OpenPlatformPkg branch: testing/hikey960_v1.3.4 OpenPlatformPkg head: 91eb48cee84cf3f74ea4753309500ea428ebdfff ARM Trusted Firmware: https://github.com/ARM-software/arm-trusted-firmware.git ARM Trusted Firmware head: 7e8a891f39acdae8679d2daec22246c678576142 OP-TEE OS: https://github.com/OP-TEE/optee_os.git OP-TEE OS head: 94ee4938f7f544d07d11721a355f445c020663ca Change-Id: I15275e395bebd9562e3b627c2afe5835cfa4643e Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-08-07Merge "hikey{,960}: Enable system-as-root and verity."android-o-mr1-iot-release-1.0.3Alistair Strachan
2018-08-06Merge Android Pie into masterXin Li
Bug: 112104996 Change-Id: If475bd23f609a2910df5ac8e0c8464971fed1a7a
2018-08-06hikey{,960}: Enable system-as-root and verity.Alistair Strachan
Add a build option TARGET_ANDROID_VERITY which can be set to anything but the empty string to enable dm-android-verity. This option is introduced because the UEFI bootloader for hikey and hikey960 has a bug where it incorrectly rejects boot.img files with no ramdisk (see https://bugs.96boards.org/show_bug.cgi?id=757). This change *will* work on a hikey960 with the non-UEFI bootloader installed. Test: local Bug: 72722987 Bug: 111829702 Change-Id: I75d0941866d9196e78e7c2943cdf05d35beb1879 Signed-off-by: Alistair Strachan <astrachan@google.com>
2018-08-03Merge "Update watchdogd path"temp_p_mergeTom Cherry
am: 2d8fb579d5 Change-Id: I7c312754b2ec6d5f0094b04a6a6bfbbe395e07ae
2018-08-03Merge "Update watchdogd path"Tom Cherry
2018-08-02hikey960: Update UEFI bootloader binaries to build #74John Stultz
am: 4a657150c9 Change-Id: Ibd8d7405743051daabff43916abb5fade65add1f
2018-08-02Update watchdogd pathTom Cherry
watchdogd is now removed from init and treated like any other system executable. Bug: 73660730 Test: watchdogd still runs Change-Id: I4b1cf0b39933fa6c60948c0d977fef6c0e112703
2018-08-02hikey960: Update UEFI bootloader binaries to build #74John Stultz
This updates the UEFI bootloader binaries to the latest build, which fixes potential PCIe issues caused by incorrectly set gpio pin Binaries are from the following build: http://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/74/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/74/ UEFI Tools: https://git.linaro.org/uefi/uefi-tools.git UEFI Tools head: c0ed79c3d7cde255d49afbf8a475a36db0c042f8 EDK2: https://github.com/96boards-hikey/edk2.git EDK2 head: 77326b5a153513c826d5a50363eace6ef6b59413 OpenPlatformPkg: https://github.com/96boards-hikey/OpenPlatformPkg.git OpenPlatformPkg branch: testing/hikey960_v1.3.4 OpenPlatformPkg head: 91eb48cee84cf3f74ea4753309500ea428ebdfff ARM Trusted Firmware: https://github.com/ARM-software/arm-trusted-firmware.git ARM Trusted Firmware head: e313c122a707aedec63134448920c466e160957e OP-TEE OS: https://github.com/OP-TEE/optee_os.git OP-TEE OS head: 94ee4938f7f544d07d11721a355f445c020663ca Change-Id: I554c580eced175a12e881c073c26dcd4d3fd50d9 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-07-31hikey960: Fix image sizes to match ptableAlistair Strachan
am: 1786ee2ac0 Change-Id: I774dfebdf7e14ed2654792cb471d9931d35c038a
2018-07-31hikey960: Enable verity for hikey960Sandeep Patil
am: a2106d17f7 Change-Id: Ie823e0445891e0a67de414a14f8ba63d89035d45
2018-07-31hikey960: Fix image sizes to match ptableAlistair Strachan
The partition table blob defines partition sizes which do not match the size of the images created by the Android build system. This tickles a bug in the libfec userspace code, which is fixed in system/extras Ia6cdbc0f35a98fdfa1fb4677951ae5c829cabb0f, but we may as well stop wasting flash space. Test: local Bug: 72722987 Change-Id: Ia971c0c3ae5b3e798b107a8c6d571cb67d8ec0b9 Signed-off-by: Alistair Strachan <astrachan@google.com>
2018-07-31hikey960: Enable verity for hikey960Sandeep Patil
Bug: None Test: Boot with verity enabled for system and vendor. Change-Id: Iaf52f6f5c9258498c67789ffffc650a54382e21c Signed-off-by: Sandeep Patil <sspatil@google.com>
2018-07-13hikey960: Update UEFI bootloader binaries to build #70John Stultz
am: b3f7fdb6d7 Change-Id: I4290cfa447e67bb868abd3fdb458592a9a2a1dca
2018-07-13Merge changes from topic "gralloc-drm_hwc-prep"Alistair Strachan
am: 9820de4a40 Change-Id: I15d1246cffa46d5b232cccd63e416ac038322c5a
2018-07-13hikey960: Update UEFI bootloader binaries to build #70John Stultz
This updates the UEFI bootloader binaries to the latest build, which hopefully resolves recently reported issue with 4gb ram boards. Binaries are from the following build: https://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/70/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/70/ UEFI Tools: https://git.linaro.org/uefi/uefi-tools.git UEFI Tools head: 6732c21093c09a3bbff84d0b2ae6dd1877f68692 EDK2: https://github.com/96boards-hikey/edk2.git EDK2 head: 7840f0aece2cf235819bfd200bd5f12caac0d537 OpenPlatformPkg: https://github.com/96boards-hikey/OpenPlatformPkg.git OpenPlatformPkg branch: testing/hikey960_v1.3.4 OpenPlatformPkg head: 1a107440a6d1c710b4fe8b0f575e934722291996 ARM Trusted Firmware: https://github.com/ARM-software/arm-trusted-firmware.git ARM Trusted Firmware head: da9d1d59d4fd722059f935aa9dec347be7f17d0d OP-TEE OS: https://github.com/OP-TEE/optee_os.git OP-TEE OS head: 94ee4938f7f544d07d11721a355f445c020663ca Change-Id: I23b622747f43480d3944482ea3ddab782156efc3 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-07-13Merge changes from topic "gralloc-drm_hwc-prep"Alistair Strachan
* changes: hikey960: gralloc960: Tweak allocation so every HWC allocation doesn't come out of cma hikey960: gralloc960: Add support for building w/ drm_hwcomposer hikey960: gralloc960: Add usage field to map to older code hikey: gralloc: Allow use of CMA heap instead of fbdev hikey: gralloc: Add union alias and additional fields to improve interop w/ hikey960 gralloc hikey: gralloc: Change to allow gralloc_priv.h to be shared gralloc/gralloc960: Drop linux/ion.h references as its gone
2018-07-11hikey960: gralloc960: Tweak allocation so every HWC allocation doesn't come ↵John Stultz
out of cma Since we only need CMA for the HW_FB, don't use CMA for every buffer, as otherwise we fragment and run out of CMA space fairly quickly. Change-Id: I3f274fa4ac4a47e80f2cb350675c197222a92a88 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-07-11hikey960: gralloc960: Add support for building w/ drm_hwcomposerJohn Stultz
If we're building with drm_hwcomposer, we need to set the following gralloc960 flags: ION_DMA_HEAP=1 DISABLE_FRAMEBUFFER_HAL=1 Change-Id: I832993b0ade105c3f72c81a28de2b8c336d283e2 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-07-11hikey960: gralloc960: Add usage field to map to older codeJohn Stultz
The r9p0 gralloc changed the names of usage field, so add a compatibility union so it will work with the platformhisi buffer importer in drm_hwcomposer Change-Id: I75d6df4a81916a5cdf51cfed3750c7dceeedc03e Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-07-11hikey: gralloc: Allow use of CMA heap instead of fbdevJohn Stultz
This allows the hikey gralloc to use the ion CMA heap instead of the fbdev device. This is needed to move to the drm_hwcomposer with FBDEV_EMULATION disabled. This enables support for both legacy kernels using older ion interface and 4.12+ and newer kernels with the newer ion interface. Change-Id: I87d86d7d4f21a40e5c64c2473aea5bb4c5947de0 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-07-11hikey: gralloc: Add union alias and additional fields to improve interop w/ ↵John Stultz
hikey960 gralloc Since we use the gralloc_priv.h for hikey960 and hikey, try to align the variable names a bit using a union. This allows drm_hwcomposer importer to need less conditionally built code. Also add logic to provide a byte_stride value, which the hikey960 gralloc and drm_hwcomposer uses. Change-Id: I9a26cd244b1790afbf74138504bb0eedd44d94d4 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-07-11hikey: gralloc: Change to allow gralloc_priv.h to be sharedJohn Stultz
Change how we include files, so that other projects can inlcude the gralloc_priv.h file here. Change-Id: I07537e2b4794595d3c2e0a0b150bad1ab9d63ca8 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-07-11gralloc/gralloc960: Drop linux/ion.h references as its goneJohn Stultz
Bionic dropped the linux/ion.h header, so make sure we don't try to include it and cause build errors. Change-Id: I6af15f1bd2b53e7d5dd29a93295bfc09df36ab62 Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-07-11Merge "hikey960: Add version check on the hisi vdec package"John Stultz
am: 7c2f3413d0 Change-Id: I2f497300455b6f2ce55ef6f8a8124eb06437f26a
2018-07-11Merge "hikey960: Add version check on the hisi vdec package"android-p-preview-5Treehugger Robot
2018-06-28hikey960: Add version check on the hisi vdec packageJohn Stultz
This adds a version check on the hisi vdec package and provides a URL to the current expected package. This did get a bit hacky as we can't check values set in the vendor pkg makefile if we use inherit-product. So we have to include it directly. I think we could do it better, but we would have to re-spin the published vendor binary, so lets hack around it this time and do better with the next package update. Change-Id: Ic6832850e9b4d03b84358060810aa17e23e5b8ae Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-06-26Revert "HACK: Workaround hikey64_only target not building with FULL_TREBLE"John Stultz
am: 1e2c80bd71 Change-Id: I5a736c2656785c346e3ca913534d1881f7c7d53d
2018-06-26Revert "HACK: Workaround hikey64_only target not building with FULL_TREBLE"android-o-mr1-iot-release-1.0.2John Stultz
A fix to the vndk lib list for 64bit only products has been committed here: https://android-review.googlesource.com/c/platform/build/+/708786 Thus, the HACK we used to keep things building is no longer needed. So this reverts commit fbb84c4d0826df64824458fa81230e7674cc21f9. Change-Id: Ice3e0596cf28580d7a52082d319b52297e00998a Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-06-24hikey/hikey960: Fix fstab pathJohn Stultz
am: 531fb4c307 Change-Id: I15f95c5413fecb009c95f414c1e6c0effbd91dfc
2018-06-22hikey/hikey960: Fix fstab pathandroid-p-preview-4John Stultz
When we moved the fstab files over, we probably shouldn't have copied them to /vendor/etc/init/ and instead used /vendor/etc/. Thus this patch corrects this. Change-Id: I2143fb6596d50289701158b58c91dfb440943231 Reported-by: Mark Salyzyn <salyzyn@android.com> Signed-off-by: John Stultz <john.stultz@linaro.org>
2018-06-21Merge "hikey960: gralloc960: Fix log.h include to avoid warnings"John Stultz
am: d4414cf278 Change-Id: Ib0b110fd5cf07b6693213fce8a45bc7be62d71cf
2018-06-21Merge "hikey960: gralloc960: Fix log.h include to avoid warnings"Treehugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 22:35:55 +0000