From cd629eda51b14f08ba60dc60c5114daee0b87092 Mon Sep 17 00:00:00 2001
From: SGCMarkus <markusornik@gmail.com>
Date: Sun, 16 Jul 2023 21:41:41 +0200
Subject: [PATCH] rtwo: switch to source built kernel

still using prebuilt dtb/dtbo
---
 BoardConfig.mk              | 16 ++--------------
 modules.load                |  4 ----
 modules.load.recovery       |  1 +
 modules.load.vendor_boot    |  1 +
 modules.load.vendor_ramdisk |  2 ++
 5 files changed, 6 insertions(+), 18 deletions(-)
 create mode 100644 modules.load.vendor_ramdisk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index e1db203..c92d9a5 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -35,30 +35,18 @@ ODM_MANIFEST_DNE_FILES := $(DEVICE_PATH)/manifest_rtwo_dne.xml
 
 # Kernel
 TARGET_KERNEL_CONFIG += \
-	vendor/ext_config/moto-kalama-rtwo.config \
-	vendor/ext_config/lineage-moto-kalama-rtwo.config
+	vendor/ext_config/moto-kalama-rtwo.config # \
 
-TARGET_KERNEL_DIR := $(DEVICE_PATH)-kernel
-
-KERNEL_MODULE_DIR := $(TARGET_KERNEL_DIR)/modules
-TARGET_FORCE_PREBUILT_KERNEL := true
-TARGET_PREBUILT_KERNEL := $(TARGET_KERNEL_DIR)/kernel
 BOARD_PREBUILT_DTBOIMAGE := $(TARGET_KERNEL_DIR)/dtbo.img
 BOARD_PREBUILT_DTBIMAGE_DIR := $(TARGET_KERNEL_DIR)
 
 # Kernel Modules
-KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko)
-
 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))
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist.vendor_boot
 BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.recovery))
-# BOOT_KERNEL_MODULES := $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD)
-BOARD_SYSTEM_DLKM_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_boot))
-
-BOARD_VENDOR_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_MODULES_LOAD)))
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD)))
+BOOT_KERNEL_MODULES := $(strip $(shell cat $(DEVICE_PATH)/modules.load.recovery $(DEVICE_PATH)/modules.load.vendor_ramdisk))
 
 # Partitions
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 230140391424
diff --git a/modules.load b/modules.load
index 4d779cd..351c686 100644
--- a/modules.load
+++ b/modules.load
@@ -172,9 +172,7 @@ mac80211.ko
 qrtr-smd.ko
 qrtr-mhi.ko
 qrtr-gunyah.ko
-qca_cld3_kiwi.ko
 qca_cld3_kiwi_v2.ko
-qca_cld3_qca6490.ko
 cnss2.ko
 cnss_plat_ipc_qmi_svc.ko
 wlan_firmware_service.ko
@@ -250,9 +248,7 @@ qce50_dlkm.ko
 hdcp_qseecom_dlkm.ko
 qrng_dlkm.ko
 smcinvoke_dlkm.ko
-qca_cld3_kiwi.ko
 qca_cld3_kiwi_v2.ko
-qca_cld3_qca6490.ko
 cnss2.ko
 cnss_plat_ipc_qmi_svc.ko
 wlan_firmware_service.ko
diff --git a/modules.load.recovery b/modules.load.recovery
index 578b948..560564a 100644
--- a/modules.load.recovery
+++ b/modules.load.recovery
@@ -283,3 +283,4 @@ mmi_info.ko
 mmi_relay.ko
 sensors_class.ko
 touchscreen_mmi.ko
+debug_symbol.ko
diff --git a/modules.load.vendor_boot b/modules.load.vendor_boot
index d3d7e73..c091b0f 100644
--- a/modules.load.vendor_boot
+++ b/modules.load.vendor_boot
@@ -94,3 +94,4 @@ c1dcvs_scmi.ko
 bcl_pmic5.ko
 nvme-core.ko
 nvme.ko
+debug_symbol.ko
diff --git a/modules.load.vendor_ramdisk b/modules.load.vendor_ramdisk
new file mode 100644
index 0000000..bcd2183
--- /dev/null
+++ b/modules.load.vendor_ramdisk
@@ -0,0 +1,2 @@
+hdcp_qseecom_dlkm.ko
+tz_log_dlkm.ko