sm8350-common: remove module loading from 5.4 gki directory

This commit is contained in:
Cosmin Tanislav 2021-09-20 06:46:02 +03:00
parent 30ddf5a818
commit 525d710638
2 changed files with 0 additions and 21 deletions

View File

@ -5,30 +5,11 @@
# Confidential and Proprietary - Qualcomm Technologies, Inc. # Confidential and Proprietary - Qualcomm Technologies, Inc.
#============================================================================= #=============================================================================
#default to /vendor/lib/modules
MODULES_PATH="/vendor/lib/modules/" MODULES_PATH="/vendor/lib/modules/"
GKI_MOD_PATH="/vendor/lib/modules/5.4-gki"
MODPROBE="/vendor/bin/modprobe" MODPROBE="/vendor/bin/modprobe"
MODULES=`${MODPROBE} -d ${MODULES_PATH} -l` MODULES=`${MODPROBE} -d ${MODULES_PATH} -l`
# Find the first non-blacklisted module and try
# inserting it. If insertion fails the module is not
# compatible with the current kernel. Change the modules
# directory to gki.
for MODULE in ${MODULES}; do
cat ${MODULES_PATH}/modules.blocklist | grep $MODULE
if [ $? -ne 0 ]; then
break
fi
done
${MODPROBE} -a -b -d ${MODULES_PATH} ${MODULE}
if [ $? -ne 0 ];then
MODULES_PATH=$GKI_MOD_PATH
MODULES=`${MODPROBE} -d ${MODULES_PATH} -l`
fi
# Iterate over module list and modprobe them in background. # Iterate over module list and modprobe them in background.
for MODULE in ${MODULES}; do for MODULE in ${MODULES}; do
if [ ${MODULE} == "qca_cld3_wlan" ]; then if [ ${MODULE} == "qca_cld3_wlan" ]; then

View File

@ -34,7 +34,6 @@ import /vendor/etc/init/hw/init.batterysecret.rc
on early-init on early-init
exec u:r:vendor_modprobe:s0 -- /vendor/bin/vendor_modprobe.sh 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 swr_dmic_dlkm swr_haptics_dlkm machine_dlkm radio-i2c-rtc6226-qca mmc_core mmc_block sdhci sdhci-pltfm sdhci-msm cdsprm tfa98xx_dlkm
wait /sys/devices/soc0/soc_id wait /sys/devices/soc0/soc_id
on init on init
@ -72,7 +71,6 @@ on init
on early-fs on early-fs
start vold start vold
exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/ cnss2 exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/ cnss2
exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/5.4-gki cnss2
on fs on fs
start hwservicemanager start hwservicemanager