diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 786d363..49a0caf 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -24,6 +24,7 @@ AB_OTA_PARTITIONS += \ vbmeta \ vbmeta_system \ vendor \ + vendor_dlkm \ vendor_boot # Architecture @@ -117,7 +118,7 @@ BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 100663296 BOARD_USES_METADATA_PARTITION := true BOARD_SUPER_PARTITION_GROUPS := qti_dynamic_partitions -BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST := odm system system_ext vendor product +BOARD_QTI_DYNAMIC_PARTITIONS_PARTITION_LIST := odm product system system_ext vendor vendor_dlkm BOARD_QTI_DYNAMIC_PARTITIONS_SIZE := 9122611200 # BOARD_SUPER_PARTITION_SIZE - 4MB BOARD_ODMIMAGE_FILE_SYSTEM_TYPE := ext4 @@ -126,6 +127,7 @@ BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := f2fs BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 +BOARD_VENDOR_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4 ifeq ($(WITH_GMS),true) BOARD_PRODUCTIMAGE_PARTITION_RESERVED_SIZE := 104857600 @@ -139,10 +141,11 @@ endif BOARD_SYSTEM_EXTIMAGE_PARTITION_RESERVED_SIZE := 104857600 BOARD_VENDORIMAGE_PARTITION_RESERVED_SIZE := 104857600 +TARGET_COPY_OUT_PRODUCT := product TARGET_COPY_OUT_ODM := odm TARGET_COPY_OUT_SYSTEM_EXT := system_ext TARGET_COPY_OUT_VENDOR := vendor -TARGET_COPY_OUT_PRODUCT := product +TARGET_COPY_OUT_VENDOR_DLKM := vendor_dlkm # Platform TARGET_BOARD_PLATFORM := lahaina diff --git a/gpt-utils/gpt-utils.h b/gpt-utils/gpt-utils.h index 3872663..2f3032b 100644 --- a/gpt-utils/gpt-utils.h +++ b/gpt-utils/gpt-utils.h @@ -83,7 +83,7 @@ extern "C" { #define PTN_MULTIIMGOEM "multiimgoem" #define PTN_MULTIIMGQTI "multiimgqti" #define PTN_SWAP_LIST PTN_XBL, PTN_XBL_CFG, PTN_MULTIIMGOEM, PTN_MULTIIMGQTI, "sbl1", "rpm", "tz", "aboot", "abl", "hyp", "lksecapp", "keymaster", "cmnlib", "cmnlib32", "cmnlib64", "pmic", "apdp", "devcfg", "hosd", "keystore", "msadp", "mdtp", "mdtpsecapp", "dsp", "aop", "qupfw", "vbmeta", "dtbo", "imagefv", "ImageFv", "uefisecapp", "vm-bootsys", "shrm", "cpucp", "featenabler", "vbmeta_system" -#define AB_PTN_LIST PTN_SWAP_LIST, "boot", "vendor_boot", "system", "system_ext", "product", "vendor", "odm", "modem", "bluetooth" +#define AB_PTN_LIST PTN_SWAP_LIST, "boot", "vendor_boot", "system", "system_ext", "product", "vendor", "vendor_dlkm", "odm", "modem", "bluetooth" #define BOOT_DEV_DIR "/dev/block/bootdevice/by-name" /****************************************************************************** diff --git a/rootdir/etc/fstab.qcom b/rootdir/etc/fstab.qcom index d262155..f3f48e7 100644 --- a/rootdir/etc/fstab.qcom +++ b/rootdir/etc/fstab.qcom @@ -39,6 +39,7 @@ system /system e system_ext /system_ext ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount product /product ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount vendor /vendor ext4 ro,barrier=1,discard wait,slotselect,avb=vbmeta,logical,first_stage_mount +vendor_dlkm /vendor_dlkm ext4 ro,barrier=1,discard wait,slotselect,avb,logical,first_stage_mount odm /odm ext4 ro,barrier=1,discard wait,slotselect,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/persist /mnt/vendor/persist ext4 noatime,nosuid,nodev,barrier=1 wait