diff options
Diffstat (limited to 'hikey960')
-rw-r--r-- | hikey960/device-hikey960.mk | 28 | ||||
-rw-r--r-- | hikey960/fstab.hikey960 | 2 |
2 files changed, 6 insertions, 24 deletions
diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk index d34dc311..fba39a48 100644 --- a/hikey960/device-hikey960.mk +++ b/hikey960/device-hikey960.mk @@ -42,35 +42,17 @@ PRODUCT_BUILD_SUPER_PARTITION := true PRODUCT_USE_DYNAMIC_PARTITIONS := true PRODUCT_USE_DYNAMIC_PARTITION_SIZE :=true -# Copy BT firmware -PRODUCT_COPY_FILES += \ - device/linaro/hikey/bt-wifi-firmware-util/TIInit_11.8.32-pcm-960.bts:$(TARGET_COPY_OUT_VENDOR)/firmware/ti-connectivity/TIInit_11.8.32.bts - -# Copy wlan firmware -PRODUCT_COPY_FILES += \ - device/linaro/hikey/bt-wifi-firmware-util/wl18xx-fw-4.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/ti-connectivity/wl18xx-fw-4.bin \ - device/linaro/hikey/bt-wifi-firmware-util/wl18xx-conf-wl1837mod.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/ti-connectivity/wl18xx-conf.bin - -# Copy hifi firmware -PRODUCT_COPY_FILES += \ - device/linaro/hikey/hifi/firmware/hifi-hikey960.img:$(TARGET_COPY_OUT_VENDOR)/firmware/hifi/hifi.img - -PRODUCT_PACKAGES += \ - dhifimesg - - # Build HiKey960 HDMI audio HAL. Experimental only may not work. FIXME PRODUCT_PACKAGES += audio.primary.hikey960 PRODUCT_PACKAGES += gralloc.hikey960 #binary blobs from ARM -PRODUCT_PACKAGES += libGLES_mali.so \ - vulkan.hikey960.so \ - libbccArm.so \ - libRSDriverArm.so \ - libmalicore.bc \ - END_USER_LICENCE_AGREEMENT.txt +PRODUCT_PACKAGES += libGLES_mali \ + vulkan.hikey960 \ + libbccArm \ + libRSDriverArm \ + libmalicore.bc ifdef MALI_RS_DRIVER_AVAILABLE PRODUCT_COPY_FILES += \ diff --git a/hikey960/fstab.hikey960 b/hikey960/fstab.hikey960 index 09356a7a..ae250da1 100644 --- a/hikey960/fstab.hikey960 +++ b/hikey960/fstab.hikey960 @@ -6,7 +6,7 @@ #/dev/block/platform/soc/ff3b0000.ufs/by-name/system_a /system ext4 ro wait #/dev/block/platform/soc/ff3b0000.ufs/by-name/cache /cache ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait #/dev/block/platform/soc/ff3b0000.ufs/by-name/userdata /data ext4 discard,noauto_da_alloc,data=ordered,user_xattr,barrier=1 wait -/dev/block/by-name/userdata /data ext4 discard,noatime,nosuid,nodev,noauto_da_alloc,data=ordered,user_xattr,barrier=1,inlinecrypt latemount,wait,formattable,fileencryption=aes-256-xts:aes-256-cts:v2+inlinecrypt_optimized,keydirectory=/metadata/vold/metadata_encryption,quota +/dev/block/by-name/userdata /data ext4 discard,noatime,nosuid,nodev,noauto_da_alloc,data=ordered,user_xattr,barrier=1 latemount,wait,formattable,fileencryption=aes-256-xts,keydirectory=/metadata/vold/metadata_encryption,quota /dev/block/by-name/cache /metadata ext4 noatime,nosuid,nodev,discard wait,formattable,first_stage_mount,check /devices/platform/soc/ff37f000.dwmmc1/mmc_host/mmc* auto auto defaults voldmanaged=sdcard1:auto,encryptable=userdata /devices/platform/soc/ff200000.hisi_usb/ff100000.dwc3/xhci-hcd.*.auto/usb* auto auto defaults voldmanaged=usbdisk:auto,encryptable=userdata |