diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 1009bb4a..b5843c7c 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -82,7 +82,6 @@ AB_OTA_UPDATER := true AB_OTA_PARTITIONS += \ system \ - system_dlkm \ system_ext \ product \ vbmeta_system @@ -133,7 +132,7 @@ $(call soong_config_set,arm_gralloc,gralloc_ion_sync_on_lock,$(BOARD_USES_GRALLO #BOARD_USES_EXYNOS_DATASPACE_FEATURE := true # Enable chain partition for system. -BOARD_AVB_VBMETA_SYSTEM := system system_dlkm system_ext product +BOARD_AVB_VBMETA_SYSTEM := system system_ext product BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) @@ -161,11 +160,6 @@ TARGET_COPY_OUT_PRODUCT := product BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_SYSTEM_EXT := system_ext -# system_dlkm.img -BOARD_USES_SYSTEM_DLKMIMAGE := true -BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4 -TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm - ######################## # Video Codec ######################## @@ -183,7 +177,6 @@ BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions BOARD_GOOGLE_DYNAMIC_PARTITIONS_SIZE := 8527020032 BOARD_GOOGLE_DYNAMIC_PARTITIONS_PARTITION_LIST := \ system \ - system_dlkm \ system_ext \ product \ vendor \ diff --git a/conf/fstab.gs101.in b/conf/fstab.gs101.in index 5ad10a3c..8b7a7e3b 100644 --- a/conf/fstab.gs101.in +++ b/conf/fstab.gs101.in @@ -5,7 +5,6 @@ # # system /system ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -system_dlkm /system_dlkm ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 system_ext /system_ext ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 product /product ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 vendor /vendor ext4 ro,barrier=1 wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128