lunaa: Inline all kernel modules

Change-Id: I9c9dcc2de8efe52815a4734ba2d72073c5b39081 Signed-off-by: dodyirawan85 <[email protected]>
Irawans-Android-Lab · Aug 15, 2023 · 85fa24d · 85fa24d
1 parent 08fdd0b
commit 85fa24d
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 109 deletions.
diff --git a/BoardConfig.mk b/BoardConfig.mk
@@ -119,13 +119,6 @@ TARGET_KERNEL_CONFIG += vendor/oplus_yupik_QGKI.config
 TARGET_KERNEL_NO_GCC := true
 TARGET_KERNEL_ADDITIONAL_FLAGS := BRAND_SHOW_FLAG=realme
 
-# Kernel modules
-BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist
-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 := $(strip $(shell cat $(DEVICE_PATH)/modules.include.recovery))
-TARGET_MODULE_ALIASES += wlan.ko:qca_cld3_wlan.ko
-
 # Platform
 BOARD_USES_QCOM_HARDWARE := true
 TARGET_BOARD_PLATFORM := lahaina

diff --git a/extract-files.sh b/extract-files.sh
@@ -67,6 +67,9 @@ function blob_fixup() {
         system_ext/lib64/libwfdnative.so)
             sed -i "s/[email protected]/libhidlbase.so\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/" "${2}"
             ;;
+	vendor/etc/init/netmgrd.rc)
+            sed -i "/modprobe/d" "${2}"
+            ;;
         vendor/etc/media_*/video_system_specs.json)
             sed -i "/max_retry_alloc_output_timeout/ s/1000/0/" "${2}"
             ;;

diff --git a/init/init.qcom.rc b/init/init.qcom.rc
@@ -45,8 +45,6 @@ on early-init
 
     chown root system /dev/kmsg
     chmod 0620 /dev/kmsg
-    # Load WIGIG platform driver
-    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules msm_11ad_proxy
 
 on init
 

diff --git a/init/init.target.rc b/init/init.target.rc
@@ -30,8 +30,6 @@
 import /vendor/etc/init/hw/init.qti.kernel.rc
 
 on early-init
-    exec u:r:vendor_modprobe:s0 -- /vendor/bin/vendor_modprobe.sh
-    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules q6_pdr_dlkm q6_notifier_dlkm snd_event_dlkm apr_dlkm adsp_loader_dlkm q6_dlkm native_dlkm pinctrl_wcd_dlkm pinctrl_lpi_dlkm swr_dlkm platform_dlkm hdmi_dlkm stub_dlkm wcd_core_dlkm wsa883x_dlkm bolero_cdc_dlkm wsa_macro_dlkm va_macro_dlkm rx_macro_dlkm tx_macro_dlkm bt_fm_slim wcd938x_dlkm wcd938x_slave_dlkm wcd937x_dlkm wcd937x_slave_dlkm swr_dmic_dlkm swr_haptics_dlkm machine_dlkm radio-i2c-rtc6226-qca cdsprm
     write /proc/sys/kernel/sched_boost 1
     wait /sys/devices/soc0/soc_id
 
@@ -137,9 +135,6 @@ on boot
     setprop vendor.usb.dpl.inst.name "dpl"
     setprop vendor.usb.qdss.inst.name "qdss_mdm"
     setprop vendor.usb.controller a600000.dwc3
-    #Load WLAN driver
-    exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/ qca_cld3_wlan qca_cld3_qca6390
-    exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/5.4-gki qca_cld3_wlan qca_cld3_qca6390
     #Allow access to memory hotplug device attributes
     chown system system /sys/kernel/mem-offline/anon_migrate
 

diff --git a/modules.blocklist b/modules.blocklist
diff --git a/modules.include.recovery b/modules.include.recovery
diff --git a/modules.load b/modules.load
diff --git a/modules.load.recovery b/modules.load.recovery
diff --git a/proprietary-files-qc.txt b/proprietary-files-qc.txt
@@ -521,7 +521,6 @@ vendor/bin/init.kernel.post_boot-lahaina.sh
 vendor/bin/init.kernel.post_boot-yupik.sh
 vendor/bin/init.kernel.post_boot.sh
 vendor/bin/init.qti.kernel.sh
-vendor/bin/vendor_modprobe.sh
 vendor/etc/init/hw/init.qti.kernel.rc
 
 # Keymaster