diff options
Diffstat (limited to 'hikey960')
| -rw-r--r-- | hikey960/BoardConfig.mk | 4 | ||||
| -rw-r--r-- | hikey960/device-hikey960.mk | 16 | ||||
| -rw-r--r-- | hikey960/fstab.hikey960 | 2 |
3 files changed, 12 insertions, 10 deletions
diff --git a/hikey960/BoardConfig.mk b/hikey960/BoardConfig.mk index 122fc67c..1ba08dbf 100644 --- a/hikey960/BoardConfig.mk +++ b/hikey960/BoardConfig.mk @@ -10,6 +10,10 @@ TARGET_NO_DTIMAGE := false BOARD_KERNEL_CMDLINE := androidboot.hardware=hikey960 console=ttyFIQ0 androidboot.console=ttyFIQ0 BOARD_KERNEL_CMDLINE += firmware_class.path=/vendor/firmware loglevel=15 efi=noruntime + +#Enable dtb fstab for treble +BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab + ifneq ($(TARGET_SENSOR_MEZZANINE),) BOARD_KERNEL_CMDLINE += overlay_mgr.overlay_dt_entry=hardware_cfg_$(TARGET_SENSOR_MEZZANINE) endif diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk index ad2f9d7f..20001d47 100644 --- a/hikey960/device-hikey960.mk +++ b/hikey960/device-hikey960.mk @@ -17,14 +17,14 @@ PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel \ $(TARGET_PREBUILT_DTB):hi3660-hikey960.dtb -PRODUCT_COPY_FILES += $(LOCAL_PATH)/fstab.hikey960:root/fstab.hikey960 \ - device/linaro/hikey/init.common.rc:root/init.hikey960.rc \ - device/linaro/hikey/init.hikey960.power.rc:root/init.hikey960.power.rc \ - device/linaro/hikey/init.common.usb.rc:root/init.hikey960.usb.rc \ - device/linaro/hikey/ueventd.common.rc:root/ueventd.hikey960.rc \ - device/linaro/hikey/common.kl:system/usr/keylayout/hikey960.kl \ - frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:system/etc/permissions/android.hardware.vulkan.level.xml \ - frameworks/native/data/etc/android.hardware.vulkan.version-1_0_3.xml:system/etc/permissions/android.hardware.vulkan.version.xml +PRODUCT_COPY_FILES += $(LOCAL_PATH)/fstab.hikey960:$(TARGET_COPY_OUT_VENDOR)/etc/init/fstab.hikey960 \ + device/linaro/hikey/init.common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.rc \ + device/linaro/hikey/init.hikey960.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.power.rc \ + device/linaro/hikey/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.usb.rc \ + device/linaro/hikey/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ + device/linaro/hikey/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/hikey960.kl \ + frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ + frameworks/native/data/etc/android.hardware.vulkan.version-1_0_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml # Copy BT firmware PRODUCT_COPY_FILES += \ diff --git a/hikey960/fstab.hikey960 b/hikey960/fstab.hikey960 index 46571873..9f183905 100644 --- a/hikey960/fstab.hikey960 +++ b/hikey960/fstab.hikey960 @@ -4,8 +4,6 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK #/dev/block/platform/soc/ff3b0000.ufs/by-name/system_a /system ext4 ro wait -/dev/block/sdd10 /system ext4 ro wait -/dev/block/sdd11 /vendor 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/sdd5 /cache ext4 discard,noatime,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 |