From a17b16ccbda6c94e55bb1859c85c4253ce798b10 Mon Sep 17 00:00:00 2001 From: Juan Yescas Date: Thu, 1 Aug 2024 08:04:16 -0700 Subject: [PATCH] 16kb: Move efs rw partitions to its own fstab file The efs read/write partitions will be part of the fstab.rw.efs file and will have their own RC file to mount them. This change allows us to identify the different partitions and their types. It will also make easier to select different RC files depending on the page size. Bug: 356425337 Test: $ source build/envsetup.sh $ lunch [zumapro]-trunk_staging-userdebug $ m $ ./vendor/google/tools/flashall -w Flag: EXEMPT bugfix Change-Id: I3eb877ecc3ccf435110ee0da4a949b44729b3bdb --- conf/fstab.rw.efs | 6 ++++++ conf/fstab.zumapro.in | 3 --- conf/init.efs.rc | 5 +++++ conf/init.zumapro.board.rc | 2 +- device.mk | 6 ++++-- 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 conf/fstab.rw.efs create mode 100644 conf/init.efs.rc diff --git a/conf/fstab.rw.efs b/conf/fstab.rw.efs new file mode 100644 index 0000000..1047887 --- /dev/null +++ b/conf/fstab.rw.efs @@ -0,0 +1,6 @@ +# Android fstab file for efs partitions +# +# +/dev/block/platform/13200000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable +/dev/block/platform/13200000.ufs/by-name/efs_backup /mnt/vendor/efs_backup f2fs noatime,sync wait,check,formattable +/dev/block/platform/13200000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata f2fs noatime,sync wait,check,formattable diff --git a/conf/fstab.zumapro.in b/conf/fstab.zumapro.in index 779b259..bcb0c2f 100644 --- a/conf/fstab.zumapro.in +++ b/conf/fstab.zumapro.in @@ -14,9 +14,6 @@ vendor /vendor vendor_dlkm /vendor_dlkm ext4 noatime,ro wait,slotselect,avb=vbmeta,avb_keys=no_such_key,logical,first_stage_mount /dev/block/platform/13200000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount /dev/block/platform/13200000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount -/dev/block/platform/13200000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable -/dev/block/platform/13200000.ufs/by-name/efs_backup /mnt/vendor/efs_backup f2fs noatime,sync wait,check,formattable -/dev/block/platform/13200000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata f2fs noatime,sync wait,check,formattable /dev/block/platform/13200000.ufs/by-name/misc /misc emmc defaults wait /dev/block/platform/13200000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount #/dev/block/platform/13200000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount diff --git a/conf/init.efs.rc b/conf/init.efs.rc new file mode 100644 index 0000000..434feb9 --- /dev/null +++ b/conf/init.efs.rc @@ -0,0 +1,5 @@ +on early-init + mount_all /vendor/etc/fstab.persist --early + +on late-fs + mount_all /vendor/etc/fstab.efs --early diff --git a/conf/init.zumapro.board.rc b/conf/init.zumapro.board.rc index 506d282..6f24fc1 100644 --- a/conf/init.zumapro.board.rc +++ b/conf/init.zumapro.board.rc @@ -1,10 +1,10 @@ import /vendor/etc/init/hw/init.zumapro.usb.rc +import /vendor/etc/init/hw/init.efs.rc import android.hardware.drm@1.2-service.widevine.rc import init.exynos.sensorhub.rc import /vendor/etc/init/hw/init.${ro.boot.hardware.platform}.soc.rc on early-init - mount_all /vendor/etc/fstab.persist --early write /proc/sys/kernel/sched_pelt_multiplier 1 write /sys/kernel/mm/lru_gen/enabled n diff --git a/device.mk b/device.mk index 44c52ca..425b888 100644 --- a/device.mk +++ b/device.mk @@ -438,7 +438,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/zumapro/conf/init.zumapro.soc.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zumapro.soc.rc \ device/google/zumapro/conf/init.zuma.soc.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zuma.soc.rc \ - device/google/zumapro/conf/init.zumapro.board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zumapro.board.rc + device/google/zumapro/conf/init.zumapro.board.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.zumapro.board.rc \ + device/google/zumapro/conf/init.efs.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.efs.rc ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) PRODUCT_COPY_FILES += \ @@ -465,7 +466,8 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.persist:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.persist \ - device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem + device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem \ + device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.rw.efs:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.efs # Shell scripts PRODUCT_PACKAGES += \