diff options
| author | John Stultz <john.stultz@linaro.org> | 2021-03-02 21:55:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-02 21:55:11 +0000 |
| commit | 632459e2a60cc284cd53a6dd5a4cb852fbbea0db (patch) | |
| tree | 6b76c3d35e7865b4c67da43c6d880b93b45fd351 | |
| parent | 9001925b0118e533101a371454b1911ca355b663 (diff) | |
| parent | 6317814f87742e675b50c61ade01dd85ff2bdea2 (diff) | |
| download | hikey-632459e2a60cc284cd53a6dd5a4cb852fbbea0db.tar.gz | |
hikey960: fstab.hikey960 Add new dynamic partitions to the vendor fstab am: a8cd4d9637 am: ff985c9b93 am: 6317814f87
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1569522
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If63b0f126a6ac8aff1f6bbc368e008f66c4cd51e
| -rw-r--r-- | fstab.ramdisk960 | 4 | ||||
| -rw-r--r-- | hikey960/device-hikey960.mk | 2 | ||||
| -rw-r--r-- | hikey960/fstab.hikey960 | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/fstab.ramdisk960 b/fstab.ramdisk960 deleted file mode 100644 index 098386d5..00000000 --- a/fstab.ramdisk960 +++ /dev/null @@ -1,4 +0,0 @@ -system /system ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect -vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect -system_ext /system_ext ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect -product /product ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk index d9010354..46ffbe72 100644 --- a/hikey960/device-hikey960.mk +++ b/hikey960/device-hikey960.mk @@ -28,7 +28,7 @@ PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel \ $(TARGET_PREBUILT_DTB):hi3660-hikey960.dtb PRODUCT_COPY_FILES += $(LOCAL_PATH)/fstab.hikey960:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.hikey960 \ - device/linaro/hikey/fstab.ramdisk960:$(TARGET_COPY_OUT_RAMDISK)/fstab.hikey960 \ + $(LOCAL_PATH)/fstab.hikey960:$(TARGET_COPY_OUT_RAMDISK)/fstab.hikey960 \ device/linaro/hikey/hikey960/init.hikey960.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/hikey960/init.hikey960.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.usb.rc \ diff --git a/hikey960/fstab.hikey960 b/hikey960/fstab.hikey960 index 0a254ceb..53e1ae4b 100644 --- a/hikey960/fstab.hikey960 +++ b/hikey960/fstab.hikey960 @@ -11,5 +11,7 @@ /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 /devices/platform/soc/f4000000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0/nvme/nvme* auto auto defaults voldmanaged=nvmedisk:auto,encryptable=userdata -/dev/block/by-name/system /system ext4 ro,errors=panic wait,first_stage_mount -/dev/block/by-name/vendor /vendor ext4 ro,errors=panic wait,first_stage_mount +system /system ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect +vendor /vendor ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect +system_ext /system_ext ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect +product /product ext4 noatime,ro,errors=panic wait,logical,first_stage_mount,slotselect |