From 20bff46da79ff78d8820a4d185ebf0d99d9eee76 Mon Sep 17 00:00:00 2001
From: Arian <arian.kulmer@web.de>
Date: Thu, 13 Nov 2025 22:41:06 +0100
Subject: [PATCH 1/4] sm6375-common: Allow to provide custom AVB keys and build
 an enabled vbmeta.img

Change-Id: I0578219addb01f094ecd9ec386e820aaf972c284
---
 BoardConfigCommon.mk | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 1e8c349..ab0697a 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -148,10 +148,22 @@ BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor
 
 # Verified Boot
 BOARD_AVB_ENABLE := true
+
+ifneq (,$(AVB_CUSTOM_KEY_PATH))
+BOARD_AVB_ALGORITHM := $(AVB_CUSTOM_ALGORITHM)
+BOARD_AVB_KEY_PATH := $(AVB_CUSTOM_KEY_PATH)
+else
+AVB_CUSTOM_ALGORITHM := SHA256_RSA2048
+AVB_CUSTOM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
+endif
+
+ifneq ($(WITH_AVB),true)
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3
+endif
+
 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_ALGORITHM := $(AVB_CUSTOM_ALGORITHM)
+BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := $(AVB_CUSTOM_KEY_PATH)
 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 2
 
 # WiFi

From b4c443ff2c04c9ad067670a27f60f0e584ae7e4a Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Mon, 1 Jun 2026 17:21:54 +0300
Subject: [PATCH 2/4] sm6375-common: Update to fogos_g V1UGS35H.75-14-3-8

Change-Id: I3ce881002eb85a57ae6f45c4e8e0e491df583e09
---
 proprietary-files.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proprietary-files.txt b/proprietary-files.txt
index 62b490b..99c9fb0 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,4 @@
-# All unpinned blobs are extracted from fogos_g V1UGS35H.75-14-3-7
+# All unpinned blobs are extracted from fogos_g V1UGS35H.75-14-3-8
 
 # ADSP
 vendor/bin/adsprpcd

From 6a8b820e91fb6fead787b4e4f8c0d19dd9b36467 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Sun, 7 Jun 2026 07:25:49 +0300
Subject: [PATCH 3/4] sm6375-common: Remove unused fingerprint services

Change-Id: Idcc9dbd5bb1c02b1afcf0e5f26cfea1e0ceb9db6
---
 rootdir/etc/init/hw/init.mmi.rc | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/rootdir/etc/init/hw/init.mmi.rc b/rootdir/etc/init/hw/init.mmi.rc
index 63066d8..4b41de3 100644
--- a/rootdir/etc/init/hw/init.mmi.rc
+++ b/rootdir/etc/init/hw/init.mmi.rc
@@ -58,7 +58,6 @@ on early-init
 on fs
     insmod /vendor/lib/modules/cci_intf.ko
     mkdir /mnt/vendor/persist/fps 0770 system system
-    exec_start vendor.ident-fps-sh
 
 on fs && property:ro.vendor.hw.modem_version=*
     # Super modem detection
@@ -338,20 +337,6 @@ service vendor.hal-fps-sh /vendor/bin/init.oem.fingerprint2.sh
     group system
     oneshot
 
-service fpc_ident /vendor/bin/hw/fpc_ident
-    class late_start
-    user system
-    group system
-    oneshot
-    disabled
-
-service egis_ident /vendor/bin/hw/egis_ident
-    class late_start
-    user system
-    group system
-    oneshot
-    disabled
-
 service vendor.touch-dead-sh /vendor/bin/init.oem.hw.sh -f
     class main
     user root

From 0f95093a242d40501fa5d58a83db6c28921fdc48 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Wed, 22 Jul 2026 13:10:01 +0300
Subject: [PATCH 4/4] sm6375-common: Update to fogos_g V1UGS35H.75-14-3-9

Change-Id: If04f2f0a9416be312af5b7adf91d2b929932c101
---
 proprietary-files.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proprietary-files.txt b/proprietary-files.txt
index 99c9fb0..2467953 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1,4 +1,4 @@
-# All unpinned blobs are extracted from fogos_g V1UGS35H.75-14-3-8
+# All unpinned blobs are extracted from fogos_g V1UGS35H.75-14-3-9
 
 # ADSP
 vendor/bin/adsprpcd