Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5e4f959 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-20' into v1-t

parents 65d7b959 aaa2ec53

BoardConfig.mk

+9 −2
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ AB_OTA_PARTITIONS += \ 
    recovery \



AB_OTA_PARTITIONS += \

    odm \

    product \

    system \

    system_ext \
@@ -108,7 +109,7 @@ BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA4096 
BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)

BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1



BOARD_AVB_VBMETA_VENDOR := vendor

BOARD_AVB_VBMETA_VENDOR := odm vendor

BOARD_AVB_VBMETA_VENDOR_KEY_PATH := external/avb/test/data/testkey_rsa4096.pem

BOARD_AVB_VBMETA_VENDOR_ALGORITHM := SHA256_RSA4096

BOARD_AVB_VBMETA_VENDOR_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
@@ -222,6 +223,7 @@ BOARD_SUPER_PARTITION_SIZE := 12884901888 
BOARD_SUPER_PARTITION_GROUPS := axolotl_dynamic_partitions

BOARD_AXOLOTL_DYNAMIC_PARTITIONS_SIZE := 6438256640

BOARD_AXOLOTL_DYNAMIC_PARTITIONS_PARTITION_LIST := \

    odm \

    product \

    system \

    system_ext \
@@ -240,6 +242,11 @@ BOARD_DTBOIMG_PARTITION_SIZE := 0x0800000 
BOARD_METADATAIMAGE_PARTITION_SIZE := 16777216

BOARD_USES_METADATA_PARTITION := true



# odm.img

BOARD_USES_ODMIMAGE := true

BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4

TARGET_COPY_OUT_ODM := odm



# persist.img

BOARD_PERSISTIMAGE_PARTITION_SIZE := 33554432

BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := ext4
@@ -262,7 +269,7 @@ TARGET_COPY_OUT_SYSTEM_EXT := system_ext 
# userdata.img

TARGET_USERIMAGES_USE_EXT4 := true

TARGET_USERIMAGES_USE_F2FS := true

BOARD_USERDATAIMAGE_PARTITION_SIZE := 10737418240

BOARD_USERDATAIMAGE_PARTITION_SIZE := 108982120448

BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs



# vendor.img

rootdir/etc/fstab.axolotl

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
system                          /system         ext4    ro,barrier=1                         wait,slotselect,avb=vbmeta_system,logical,first_stage_mount

system_ext                      /system_ext     ext4    ro,barrier=1                         wait,slotselect,avb=vbmeta_system,logical,first_stage_mount

product                         /product        ext4    ro,barrier=1                         wait,slotselect,avb=vbmeta,logical,first_stage_mount

odm                             /odm            ext4    ro,barrier=1                         wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount

vendor                          /vendor         ext4    ro,barrier=1                         wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount



/dev/block/by-name/metadata     /metadata       ext4    noatime,nosuid,nodev,discard,data=journal,commit=1    wait,formattable,first_stage_mount,check,metadata_csum

rootdir/etc/init.target.rc

+1 −6
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ on early-init 
    mount_all /vendor/etc/fstab.persist --early



on init

    start logd



    wait /dev/block/platform/soc/1d84000.ufshc

    symlink /dev/block/platform/soc/1d84000.ufshc /dev/block/bootdevice
@@ -30,16 +28,13 @@ on late-fs 
    start vendor.hwcomposer-2-3

    start vendor.configstore-hal

    start vendor.qti.hardware.display.allocator

    start vendor.light-hal-2-0

    start vendor.light-default



    # Wait for hwservicemanager ready since fsck might be triggered in mount_all --late

    # In such case, init won't responce the property_set from hwservicemanager and then

    # cause services for bootanim not running.

    wait_for_prop hwservicemanager.ready true



    # Wait for keymaster

    exec_start wait_for_keymaster



    mount_all /vendor/etc/fstab.qcom --late



on post-fs

rootdir/etc/ueventd.qcom.rc

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ firmware_directories /vendor/firmware_mnt/image/ 


#qvr

/dev/qvr_external_sensor_ioctl      0660  system  system

/sys/kernel/qvr_external_sensor/fd  0660  system  system

/sys/kernel/qvr_external_sensor fd  0660  system  system



# wlan

/dev/wcnss_wlan           0660   system     system