From a8cd4d963758cbcaaaf83a1f6c864c27f01f1034 Mon Sep 17 00:00:00 2001 From: John Stultz Date: Tue, 2 Feb 2021 04:31:01 +0000 Subject: hikey960: fstab.hikey960 Add new dynamic partitions to the vendor fstab While we boot up properly with the dynamic partitions in only the ramdisk fstab, Yongqin noted adb remount was failing recently. On looking into the issue, I realized one issue is we don't have the dynamic paritions listed in the vendor fstab which causes some of the remount logic to not find the partitions. This patch adds the dynamic partitions and unifies the fstab file for hikey960 so we have the same one for both the ramdisk and vendor image. NOTE: adb remount still does not fully work with this change. We will need a follow on patch to fix that. Signed-off-by: John Stultz Change-Id: Idf9c463162398ef89db31fbf69d205d1a47e2cdd --- fstab.ramdisk960 | 4 ---- hikey960/device-hikey960.mk | 2 +- hikey960/fstab.hikey960 | 6 ++++-- 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 fstab.ramdisk960 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 -- cgit v1.2.3