From 44e20470d20783b97a023faa1b26ea231bdf611b Mon Sep 17 00:00:00 2001
From: Albert Tang <tangalbert919@yahoo.com>
Date: Fri, 19 Aug 2022 15:48:41 -0500
Subject: [PATCH] dre: Sync modules.load with DE2117_11.C.15

Change-Id: If6e9b7fcc8fa8fa355848ee8fb6f3dbb46ab777a
---
 BoardConfig.mk        |  2 --
 modules.load          | 66 ++++++++++++++++++-------------------------
 modules.load.recovery |  4 ---
 3 files changed, 27 insertions(+), 45 deletions(-)
 delete mode 100644 modules.load.recovery

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 67ff350..26f0bbc 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -120,8 +120,6 @@ TARGET_KERNEL_CONFIG := vendor/holi-qgki_defconfig
 
 # Kernel modules
 BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(DEVICE_PATH)/modules.load))
-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)
 
 # Metadata
 BOARD_USES_METADATA_PARTITION := true
diff --git a/modules.load b/modules.load
index 715e234..9446649 100644
--- a/modules.load
+++ b/modules.load
@@ -1,47 +1,35 @@
-sia81xx_dlkm.ko
-va_macro_dlkm.ko
-rdbg.ko
-wsa881x_analog_dlkm.ko
-bootloader_log.ko
-native_dlkm.ko
-swr_ctrl_dlkm.ko
-sim_holder_detect.ko
-adsp_loader_dlkm.ko
-wcd938x_dlkm.ko
-snd_event_dlkm.ko
 swr_dlkm.ko
-q6_dlkm.ko
-gf_spi_driver.ko
-machine_dlkm.ko
-camera.ko
-wcd937x_dlkm.ko
-project_info.ko
-wcd938x_slave_dlkm.ko
-wcd_core_dlkm.ko
-platform_dlkm.ko
-st21nfc.ko
-op_rf_cable_monitor.ko
-tri_key.ko
-aw8697.ko
-op_cmdline.ko
-tx_macro_dlkm.ko
-q6_notifier_dlkm.ko
-mbhc_dlkm.ko
-btpower.ko
-apr_dlkm.ko
-wcd9xxx_dlkm.ko
-rx_macro_dlkm.ko
-fpc1020_platform_tee.ko
-bt_fm_slim.ko
+native_dlkm.ko
 wcd937x_slave_dlkm.ko
+btpower.ko
 q6_pdr_dlkm.ko
-aw87xxx_dlkm.ko
-bolero_cdc_dlkm.ko
-oem_aboard.ko
+va_macro_dlkm.ko
+q6_notifier_dlkm.ko
+apr_dlkm.ko
+snd_event_dlkm.ko
+machine_dlkm.ko
+wcd938x_dlkm.ko
+wcd_core_dlkm.ko
+wcd937x_dlkm.ko
+adsp_loader_dlkm.ko
+q6_dlkm.ko
+sia81xx_dlkm.ko
+mbhc_dlkm.ko
+swr_ctrl_dlkm.ko
+rdbg.ko
+camera.ko
 pinctrl_lpi_dlkm.ko
+rx_macro_dlkm.ko
+wcd938x_slave_dlkm.ko
+wcd9xxx_dlkm.ko
+tx_macro_dlkm.ko
+bt_fm_slim.ko
+wsa881x_analog_dlkm.ko
+bolero_cdc_dlkm.ko
 stub_dlkm.ko
-fingerprint_detect.ko
-wlan.ko
+platform_dlkm.ko
+qca_cld3_wlan.ko
+qca_cld3_wlan.ko
 rmnet_core.ko
 rmnet_ctl.ko
 rmnet_offload.ko
diff --git a/modules.load.recovery b/modules.load.recovery
deleted file mode 100644
index 89371e7..0000000
--- a/modules.load.recovery
+++ /dev/null
@@ -1,4 +0,0 @@
-fingerprint_detect.ko
-gf_spi_driver.ko
-op_cmdline.ko
-project_info.ko