diff --git a/conf/fstab.gs201.in b/conf/fstab.gs201.in index 0b6f2531..977266ba 100644 --- a/conf/fstab.gs201.in +++ b/conf/fstab.gs201.in @@ -12,9 +12,6 @@ vendor /vendor 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 -/dev/block/platform/14700000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable -/dev/block/platform/14700000.ufs/by-name/efs_backup /mnt/vendor/efs_backup f2fs noatime,sync wait,check,formattable -/dev/block/platform/14700000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata f2fs noatime,sync wait,check,formattable /dev/block/platform/14700000.ufs/by-name/misc /misc emmc defaults wait /dev/block/platform/14700000.ufs/by-name/metadata /metadata f2fs noatime,nosuid,nodev,sync wait,check,formattable,first_stage_mount #/dev/block/platform/14700000.ufs/by-name/pvmfw /pvmfw emmc defaults wait,slotselect,avb=pvmfw,first_stage_mount diff --git a/conf/fstab.modem b/conf/fstab.modem index d687ace5..7393362a 100644 --- a/conf/fstab.modem +++ b/conf/fstab.modem @@ -1,5 +1,8 @@ # Android fstab file. # # Create the specific fstab file for modem partition as flexibility +/dev/block/platform/14700000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable +/dev/block/platform/14700000.ufs/by-name/efs_backup /mnt/vendor/efs_backup f2fs noatime,sync wait,check,formattable +/dev/block/platform/14700000.ufs/by-name/modem_userdata /mnt/vendor/modem_userdata f2fs noatime,sync wait,check,formattable /dev/block/platform/14700000.ufs/by-name/modem /mnt/vendor/modem_img erofs ro,defaults,context=u:object_r:modem_img_file:s0 wait,slotselect /dev/block/platform/14700000.ufs/by-name/modem /mnt/vendor/modem_img ext4 ro,defaults,context=u:object_r:modem_img_file:s0,barrier=1 wait,slotselect diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index e65da325..42cd9b57 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -233,9 +233,6 @@ on init chown system system /sys/devices/platform/10da0000.hsi2c/i2c-6/6-0050/eeprom chown system system /sys/devices/platform/10da0000.hsi2c/i2c-7/7-0050/eeprom - # Modem temperature driver - chown radio system /sys/devices/platform/cp-tm1/cp_temp - # Loading common kernel modules in background start insmod_sh_common @@ -341,37 +338,16 @@ on post-fs-data # Log data folder mkdir /data/vendor 0771 radio system mkdir /data/vendor/log 0771 radio system - mkdir /data/vendor/log/cbd 0771 radio system - mkdir /data/vendor/log/rfsd 0771 radio system mkdir /data/exynos/log 0771 radio system mkdir /data/vendor/rild 0771 radio system mkdir /data/vendor/dump 0771 radio system - mkdir /data/vendor/slog 0771 system system # PixelLogger log paths. mkdir /data/vendor/radio 773 system radio mkdir /data/vendor/radio/logs 773 system radio mkdir /data/vendor/radio/logs/always-on 777 system radio - # Modem extended log folder - mkdir /data/vendor/radio/extended_logs 0770 radio system - - # Modem MDS log folder - mkdir /data/vendor/radio/mds 0771 radio system - - # Unzipped modem images folder - mkdir /data/vendor/radio/image 0771 radio system - - # Modem stat folder - mkdir /data/vendor/modem_stat 0771 radio system - write /data/vendor/modem_stat/debug.txt "" - chown radio system /data/vendor/modem_stat/debug.txt - chmod 0664 /data/vendor/modem_stat/debug.txt - - # Modem replay folder - mkdir /mnt/vendor/modem_userdata/replay 0775 radio system - # Write display frequency config from RadioExt HAL # OSC frequency files @@ -536,23 +512,11 @@ on property:persist.vendor.radio.no_modem_board=1 on fs mount_all --early - restorecon_recursive /mnt/vendor/efs - chown radio system /mnt/vendor/efs - restorecon_recursive /mnt/vendor/efs_backup - chown radio system /mnt/vendor/efs_backup - restorecon_recursive /mnt/vendor/modem_userdata - chown radio system /mnt/vendor/modem_userdata - - # Mount modem partition - mount_all /vendor/etc/fstab.modem --early - restorecon_recursive /mnt/vendor/modem_img - restorecon_recursive /mnt/vendor/persist restorecon_recursive /mnt/vendor/persist/aoc restorecon_recursive /mnt/vendor/persist/audio restorecon_recursive /mnt/vendor/persist/sensors restorecon_recursive /mnt/vendor/persist/battery - restorecon_recursive /mnt/vendor/persist/modem # Set up display-related directories and permissions # Add restorecon_recursive command to make sure the restorecon label is persist_display_file. restorecon_recursive /mnt/vendor/persist/display diff --git a/conf/init.modem.rc b/conf/init.modem.rc new file mode 100644 index 00000000..96ed0678 --- /dev/null +++ b/conf/init.modem.rc @@ -0,0 +1,42 @@ +on init + # Modem temperature driver + chown radio system /sys/devices/platform/cp-tm1/cp_temp + +on post-fs-data + # Log data folder + mkdir /data/vendor 0771 radio system + mkdir /data/vendor/log 0771 radio system + mkdir /data/vendor/log/cbd 0771 radio system + mkdir /data/vendor/log/rfsd 0771 radio system + mkdir /data/vendor/slog 0771 system system + + # Modem extended log folder + mkdir /data/vendor/radio/extended_logs 0770 radio system + + # Modem MDS log folder + mkdir /data/vendor/radio/mds 0771 radio system + + # Unzipped modem images folder + mkdir /data/vendor/radio/image 0771 radio system + + # Modem stat folder + mkdir /data/vendor/modem_stat 0771 radio system + write /data/vendor/modem_stat/debug.txt "" + chown radio system /data/vendor/modem_stat/debug.txt + chmod 0664 /data/vendor/modem_stat/debug.txt + + # Modem replay folder + mkdir /mnt/vendor/modem_userdata/replay 0775 radio system + +on fs + # Mount modem partition + mount_all /vendor/etc/fstab.modem --early + + restorecon_recursive /mnt/vendor/efs + chown radio system /mnt/vendor/efs + restorecon_recursive /mnt/vendor/efs_backup + chown radio system /mnt/vendor/efs_backup + restorecon_recursive /mnt/vendor/modem_userdata + chown radio system /mnt/vendor/modem_userdata + restorecon_recursive /mnt/vendor/modem_img + restorecon_recursive /mnt/vendor/persist/modem diff --git a/device.mk b/device.mk index cddf5b48..e0e7b45f 100644 --- a/device.mk +++ b/device.mk @@ -294,7 +294,6 @@ 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 # Shell scripts PRODUCT_COPY_FILES += \ @@ -902,6 +901,10 @@ endif PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.radio.multisim_switch_support=true +PRODUCT_COPY_FILES += \ + device/google/$(TARGET_BOARD_PLATFORM)/conf/init.modem.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.modem.rc \ + device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem \ + #GPS HAL include device/google/gs201/gnss/device-gnss.mk endif