From 35abf9b94e162a1c8a59c6864bcdac1e168c8441 Mon Sep 17 00:00:00 2001 From: mikairyuu Date: Sun, 23 Oct 2022 13:46:15 +1000 Subject: [PATCH] Revert "sm7250-common: Swich to EROFS" This reverts commit 2284ac6ad50b86fc9208cdba6e4465e388f869d1. --- BoardConfigCommon.mk | 14 +++++--------- rootdir/etc/fstab.default | 5 ----- rootdir/etc/recovery.fstab | 5 ----- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index f586154..2d13249 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -125,11 +125,11 @@ endif BOARD_ODMIMAGE_PARTITION_RESERVED_SIZE := 30720000 BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 30720000 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := erofs -BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := erofs -BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := erofs -BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := erofs -BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := erofs +BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_SUPER_PARTITION_GROUPS := qti_dynamic_partitions BOARD_SUPER_PARTITION_SIZE := 9126805504 BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST := odm product system system_ext vendor @@ -141,10 +141,6 @@ TARGET_COPY_OUT_PRODUCT := product TARGET_COPY_OUT_SYSTEM_EXT := system_ext TARGET_COPY_OUT_VENDOR := vendor -# EROFS -BOARD_EROFS_COMPRESSOR := lz4 -BOARD_EROFS_PCLUSTER_SIZE := 262144 - # Platform BOARD_VENDOR := xiaomi BOARD_USES_QCOM_HARDWARE := true diff --git a/rootdir/etc/fstab.default b/rootdir/etc/fstab.default index 9620cbf..8773e01 100644 --- a/rootdir/etc/fstab.default +++ b/rootdir/etc/fstab.default @@ -31,15 +31,10 @@ # system /system ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey,readahead_size_kb=128 -system /system erofs ro wait,avb,logical,first_stage_mount,avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey,readahead_size_kb=128 system_ext /system_ext ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount,readahead_size_kb=128 -system_ext /system_ext erofs ro wait,avb,logical,first_stage_mount,readahead_size_kb=128 product /product ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount,readahead_size_kb=128 -product /product erofs ro wait,avb,logical,first_stage_mount,readahead_size_kb=128 vendor /vendor ext4 ro,barrier=1,discard wait,avb=vbmeta,logical,first_stage_mount,readahead_size_kb=128 -vendor /vendor erofs ro wait,avb=vbmeta,logical,first_stage_mount,readahead_size_kb=128 odm /odm ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount -odm /odm erofs ro wait,avb,logical,first_stage_mount /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,formattable,first_stage_mount /dev/block/bootdevice/by-name/cache /cache ext4 nosuid,noatime,nodev,barrier=1 wait /dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier,inlinecrypt latemount,wait,check,formattable,fileencryption=ice,wrappedkey,quota,reservedsize=128M,checkpoint=fs,readahead_size_kb=128 diff --git a/rootdir/etc/recovery.fstab b/rootdir/etc/recovery.fstab index 13a64a3..e6113a6 100644 --- a/rootdir/etc/recovery.fstab +++ b/rootdir/etc/recovery.fstab @@ -30,15 +30,10 @@ #device mount point fstype [device2] [length=] system /system ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount -system /system erofs ro wait,avb,logical,first_stage_mount system_ext /system_ext ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount -system_ext /system_ext erofs ro wait,avb,logical,first_stage_mount vendor /vendor ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount -vendor /vendor erofs ro wait,avb,logical,first_stage_mount odm /odm ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount -odm /odm erofs ro wait,avb,logical,first_stage_mount product /product ext4 ro,barrier=1,discard wait,avb,logical,first_stage_mount -product /product erofs ro wait,avb,logical,first_stage_mount /dev/block/by-name/metadata /metadata ext4 noatime,nosuid,nodev,discard wait,check,formattable,first_stage_mount /dev/block/bootdevice/by-name/cache /cache ext4 noatime,nosuid,nodev,barrier=1,data=ordered wait,check /dev/block/bootdevice/by-name/userdata /data f2fs noatime,nosuid,nodev,discard,reserve_root=32768,resgid=1065,fsync_mode=nobarrier latemount,wait,check,formattable,encryptable=footer,quota,reservedsize=128M,checkpoint=fs