From 6bb8567a6b096f63d4ac15a00202b224d7f69e54 Mon Sep 17 00:00:00 2001 From: Yongqin Liu Date: Fri, 11 Mar 2022 21:59:08 +0800 Subject: fstab.hikey960: drop the inlinecrypt option as hikey960 does not have working inline encryption hardware, according to the discussion here https://issuetracker.google.com/issues/211809789?pli=1 Test: boot tested hikey960 with 4.14, 4.19, 5.4 and android-mainline kernel Signed-off-by: Yongqin Liu Change-Id: I819225acbd4f5717ab8bc54a78df95c81d7a19ca --- hikey960/fstab.hikey960 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3