From 571881636e0540d09a8136d101cef63899bca7f4 Mon Sep 17 00:00:00 2001 From: Marc Bourgoin Date: Wed, 29 Mar 2023 23:11:29 -0600 Subject: [PATCH] xpeng: Fix fingerprint sensor entries in ramdisk We aren't currently using GKI so we need to drop this from our bash script and since it also handles insmod of the kernel modules we can drop that from the rc script Change-Id: Ia1a0c2cc68b37c12306094ef69fdef3379225201 --- rootdir/bin/init.oem.fingerprint2.sh | 5 +---- rootdir/etc/init/hw/init.mmi.overlay.rc | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/rootdir/bin/init.oem.fingerprint2.sh b/rootdir/bin/init.oem.fingerprint2.sh index a663c1d..83bf314 100644 --- a/rootdir/bin/init.oem.fingerprint2.sh +++ b/rootdir/bin/init.oem.fingerprint2.sh @@ -17,9 +17,6 @@ function log { echo "$script_name: $*" > /dev/kmsg } -PROP_GKI_PATH=ro.vendor.mot.gki.path -GKI_PATH=$(getprop $PROP_GKI_PATH) - # for new projects, only need to config varible vendor_list,kernel_so_list,kernel_so_name_list,hal_list # vendor_list: the array contains the sensor name, it will be used for system properties. # kernel_so_list: the array contains the kernel so's absolute path. It will be used at insmod. @@ -28,7 +25,7 @@ GKI_PATH=$(getprop $PROP_GKI_PATH) # # note: all arrays should have the same size. vendor_list=('egis' 'fpc' 'goodix') -kernel_so_list=("/vendor/lib/modules/$GKI_PATH/rbs_fps_mmi.ko" "/vendor/lib/modules/$GKI_PATH/fpc1020_mmi.ko" "/vendor/lib/modules/$GKI_PATH/goodix_fod_mmi.ko") +kernel_so_list=("/vendor/lib/modules/rbs_fps_mmi.ko" "/vendor/lib/modules/fpc1020_mmi.ko" "/vendor/lib/modules/goodix_fod_mmi.ko") kernel_so_name_list=("rbs_fps_mmi.ko" "fpc1020_mmi.ko" "goodix_fod_mmi.ko") hal_list=('ets_hal' 'fps_hal' 'vendor.fps_hal') last_vendor_index=`expr ${#vendor_list[@]} - 1` diff --git a/rootdir/etc/init/hw/init.mmi.overlay.rc b/rootdir/etc/init/hw/init.mmi.overlay.rc index 754ab1e..de7b7d8 100644 --- a/rootdir/etc/init/hw/init.mmi.overlay.rc +++ b/rootdir/etc/init/hw/init.mmi.overlay.rc @@ -11,15 +11,12 @@ on early-init insmod /vendor/lib/modules/bm_adsp_ulog.ko insmod /vendor/lib/modules/camera.ko insmod /vendor/lib/modules/cci_intf.ko - insmod /vendor/lib/modules/fpc1020_mmi.ko - insmod /vendor/lib/modules/goodix_fod_mmi.ko insmod /vendor/lib/modules/leds_aw99703.ko insmod /vendor/lib/modules/leds_lm3697.ko insmod /vendor/lib/modules/mmi_charger.ko insmod /vendor/lib/modules/mmi_sys_temp.ko insmod /vendor/lib/modules/qpnp_adaptive_charge.ko insmod /vendor/lib/modules/qti_glink_charger.ko - insmod /vendor/lib/modules/rbs_fps_mmi.ko insmod /vendor/lib/modules/wl2866d.ko on post-fs