diff options
-rw-r--r-- | build/tasks/dtimage.mk | 2 | ||||
-rw-r--r-- | device-common.mk | 2 | ||||
-rw-r--r-- | hikey960/fstab.hikey960 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/build/tasks/dtimage.mk b/build/tasks/dtimage.mk index f102d6c4..86cc290e 100644 --- a/build/tasks/dtimage.mk +++ b/build/tasks/dtimage.mk @@ -2,7 +2,7 @@ ifneq ($(filter hikey%, $(TARGET_DEVICE)),) ifneq ($(TARGET_NO_DTIMAGE), true) # make sure the vendor package is present -include device/linaro/dragonboard/vendor-package-ver.mk +include device/linaro/hikey/vendor-package-ver.mk ifneq (,$(wildcard $(LINARO_VENDOR_PATH)/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/version.mk)) MKDTIMG := $(LINARO_VENDOR_PATH)/hikey960/$(EXPECTED_LINARO_VENDOR_VERSION)/bootloader/mkdtimg diff --git a/device-common.mk b/device-common.mk index 3f9c282c..0e498f46 100644 --- a/device-common.mk +++ b/device-common.mk @@ -38,7 +38,7 @@ else $(warning $(VND_PKG_URL) ) $(warning And extract in the ANDROID_TOP_DIR) endif -$(warning, EXPECTED_LINARO_VENDOR_VERSION=$(EXPECTED_LINARO_VENDOR_VERSION)) +$(warning EXPECTED_LINARO_VENDOR_VERSION=$(EXPECTED_LINARO_VENDOR_VERSION)) ifneq (,$(filter $(TARGET_PRODUCT),hikey960_tv hikey_tv)) # Setup TV Build 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 |