diff options
| author | alk3pInjection <webmaster@raspii.tech> | 2023-09-16 08:46:24 +0800 |
|---|---|---|
| committer | alk3pInjection <webmaster@raspii.tech> | 2023-09-16 08:46:24 +0800 |
| commit | 6a6d804d1ed45987e882aaef5abd9b0a8cf2fd91 (patch) | |
| tree | 29aed424c3f8658ae7238583e786e50e21927dbd | |
| parent | da2a40a805598c50da20b5de138c8f2897e3ea9a (diff) | |
gs201: Switch to EROFS
See also: https://source.android.com/docs/core/architecture/kernel/erofs
Change-Id: I7212a0807abc95014eee9bd8194c87abaf217a55
| -rw-r--r-- | BoardConfig-common.mk | 13 | ||||
| -rw-r--r-- | BoardConfigICE.mk | 4 | ||||
| -rw-r--r-- | conf/fstab.gs201.in | 6 | ||||
| -rw-r--r-- | conf/fstab.postinstall | 1 | ||||
| -rw-r--r-- | device.mk | 2 |
5 files changed, 20 insertions, 6 deletions
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index ccfe82aa..62dfe624 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -163,12 +163,19 @@ PRODUCT_FS_COMPRESSION := 1 BOARD_FLASH_BLOCK_SIZE := 4096 BOARD_MOUNT_SDCARD_RW := true +# EROFS tuning +BOARD_EROFS_COMPRESSOR := lz4 +BOARD_EROFS_PCLUSTER_SIZE := 262144 + +# system.img +BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := erofs + # product.img -BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := erofs TARGET_COPY_OUT_PRODUCT := product # system_ext.img -BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := erofs TARGET_COPY_OUT_SYSTEM_EXT := system_ext # persist.img @@ -204,7 +211,7 @@ BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336 # Build a separate system_dlkm partition BOARD_USES_SYSTEM_DLKMIMAGE := true -BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := erofs TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm # Testing related defines diff --git a/BoardConfigICE.mk b/BoardConfigICE.mk index a54e8564..d83fb332 100644 --- a/BoardConfigICE.mk +++ b/BoardConfigICE.mk @@ -17,8 +17,8 @@ AB_OTA_PARTITIONS += \ vendor \ vendor_dlkm -BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 -BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := erofs +BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE := erofs TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm # Enable chain partition for vendor. diff --git a/conf/fstab.gs201.in b/conf/fstab.gs201.in index 977266ba..b6f9249a 100644 --- a/conf/fstab.gs201.in +++ b/conf/fstab.gs201.in @@ -4,11 +4,17 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK # #<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> +system /system erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 system /system ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +system_dlkm /system_dlkm erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 system_dlkm /system_dlkm ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +system_ext /system_ext erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 system_ext /system_ext ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +product /product erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 product /product ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +vendor /vendor erofs ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128 vendor /vendor ext4 ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128 +vendor_dlkm /vendor_dlkm erofs ro wait,slotselect,avb=vbmeta,logical,first_stage_mount vendor_dlkm /vendor_dlkm ext4 ro wait,slotselect,avb=vbmeta,logical,first_stage_mount /dev/block/platform/14700000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount /dev/block/platform/14700000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount diff --git a/conf/fstab.postinstall b/conf/fstab.postinstall index 955fba71..4584bee4 100644 --- a/conf/fstab.postinstall +++ b/conf/fstab.postinstall @@ -1,4 +1,5 @@ # Android fstab file. # #<src> <mnt_point> <type> <mnt_flags and options> <fs_mgr_flags> +system /postinstall erofs ro,nosuid,nodev,noexec slotselect_other,logical,avb_keys=/product/etc/security/avb/system_other.avbpubkey system /postinstall ext4 ro,nosuid,nodev,noexec slotselect_other,logical,avb_keys=/product/etc/security/avb/system_other.avbpubkey @@ -21,7 +21,7 @@ TARGET_BOARD_PLATFORM := gs201 AB_OTA_POSTINSTALL_CONFIG += \ RUN_POSTINSTALL_system=true \ POSTINSTALL_PATH_system=system/bin/otapreopt_script \ - FILESYSTEM_TYPE_system=ext4 \ + FILESYSTEM_TYPE_system=erofs \ POSTINSTALL_OPTIONAL_system=true # Set Vendor SPL to match platform |