From 58893b442fe64f8061323c5b0cecb210531ed882 Mon Sep 17 00:00:00 2001 From: Ramji Jiyani Date: Wed, 9 Mar 2022 10:58:46 -0800 Subject: [PATCH] gs101: Enable system_dlkm dynamic partition Set flags to enable system_dlkm dynamic partition for GKI Modules for gs101 devices. Partition will be empty as of now but this adds enough support to pass the vts for the feature. Bug: 222334390 Test: TH, manual build, flash and verification on 6Pro Full OTA Update test from S to T as below: 1. go/flash: git_sc-v2-release - SP2A.220405.004 (8233519) 2. Full ota build from tm-dev 3. Manual push full ota update and verify boot 4. Verify system_dlkm partition is present & mounted Signed-off-by: Ramji Jiyani Change-Id: I0b4038b100add965737527b72a8d5f905907e23e --- BoardConfig-common.mk | 9 ++++++++- conf/fstab.gs101.in | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 7b5287dd..5038d378 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -80,6 +80,7 @@ AB_OTA_UPDATER := true AB_OTA_PARTITIONS += \ system \ + system_dlkm \ system_ext \ product \ vbmeta_system @@ -130,7 +131,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_ext product +BOARD_AVB_VBMETA_SYSTEM := system system_dlkm 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) @@ -158,6 +159,11 @@ 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 ######################## @@ -175,6 +181,7 @@ 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 8b7a7e3b..5ad10a3c 100644 --- a/conf/fstab.gs101.in +++ b/conf/fstab.gs101.in @@ -5,6 +5,7 @@ # # 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