From f5e3530b33a45f0f046f4b9be3ffe4aaa842a56f Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Sat, 9 Sep 2023 16:37:27 +0100
Subject: [PATCH] rtwo: Properly include and load GKI modules

This allows GKI modules to be copied to GKI module partition,
that is system_dlkm.

Change-Id: Id7e90aa17a60f32bc70d18469c910fa4ed7db1d5
---
 BoardConfig.mk           | 2 ++
 modules.load             | 2 --
 modules.load.system_dlkm | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 modules.load.system_dlkm

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7cf365d..ebc2239 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -42,6 +42,8 @@ BOARD_PREBUILT_DTBOIMAGE := $(TARGET_KERNEL_DIR)/dtbo.img
 BOARD_PREBUILT_DTBIMAGE_DIR := $(TARGET_KERNEL_DIR)
 
 # Kernel Modules
+BOARD_SYSTEM_KERNEL_MODULES := $(strip $(shell cat $(DEVICE_PATH)/modules.load.system_dlkm))
+BOARD_SYSTEM_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.system_dlkm))
 BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load))
 BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_boot))
diff --git a/modules.load b/modules.load
index f0ad6c0..351c686 100644
--- a/modules.load
+++ b/modules.load
@@ -371,5 +371,3 @@ goodix_fod_mmi.ko
 qpnp_adaptive_charge.ko
 mmi_sys_temp.ko
 msm_kgsl.ko
-zsmalloc.ko
-zram.ko
diff --git a/modules.load.system_dlkm b/modules.load.system_dlkm
new file mode 100644
index 0000000..0cc815c
--- /dev/null
+++ b/modules.load.system_dlkm
@@ -0,0 +1,2 @@
+zram.ko
+zsmalloc.ko