From 43a46e43912fb624abc512c1629069fdeea3da6a Mon Sep 17 00:00:00 2001 From: Zheng Pan Date: Wed, 1 Mar 2023 14:10:03 -0800 Subject: [PATCH] Shusky: Move init.insmod.cfg from vendor to vendor_dlkm To decouple init.insmod.${device}.cfg from HLOS, it is moved to kernel repo and built in vendor_dlkm.img. Also make init.rc to load it from vendor_dlkm/ Bug: 270603150 Test: Build image and flash, make sure modules are loaded. Change-Id: Ib280bc587041531198052aae3f9dd05c1a0f975e --- conf/init.husky.rc | 2 +- conf/init.ripcurrent.rc | 2 +- conf/init.shiba.rc | 2 +- device-husky.mk | 4 ---- device-ripcurrent.mk | 4 ---- device-shiba.mk | 4 ---- init.insmod.husky.cfg | 19 ------------------- init.insmod.ripcurrent.cfg | 20 -------------------- init.insmod.shiba.cfg | 19 ------------------- 9 files changed, 3 insertions(+), 73 deletions(-) delete mode 100644 init.insmod.husky.cfg delete mode 100644 init.insmod.ripcurrent.cfg delete mode 100644 init.insmod.shiba.cfg diff --git a/conf/init.husky.rc b/conf/init.husky.rc index 0d259be..a1b0a2c 100644 --- a/conf/init.husky.rc +++ b/conf/init.husky.rc @@ -17,7 +17,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_husky -service insmod_sh_husky /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg +service insmod_sh_husky /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg class main user root group root system diff --git a/conf/init.ripcurrent.rc b/conf/init.ripcurrent.rc index b0d9d9d..9137fe5 100644 --- a/conf/init.ripcurrent.rc +++ b/conf/init.ripcurrent.rc @@ -14,7 +14,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_ripcurrent -service insmod_sh_ripcurrent /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg +service insmod_sh_ripcurrent /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg class main user root group root system diff --git a/conf/init.shiba.rc b/conf/init.shiba.rc index 2a116cd..f40cd3a 100644 --- a/conf/init.shiba.rc +++ b/conf/init.shiba.rc @@ -17,7 +17,7 @@ on early-boot wait_for_prop vendor.common.modules.ready 1 start insmod_sh_shiba -service insmod_sh_shiba /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg +service insmod_sh_shiba /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg class main user root group root system diff --git a/device-husky.mk b/device-husky.mk index 9bfab79..1850044 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -46,10 +46,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/shusky/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.husky.rc -# insmod files -PRODUCT_COPY_FILES += \ - device/google/shusky/init.insmod.husky.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.husky.cfg - # Camera PRODUCT_COPY_FILES += \ device/google/shusky/media_profiles_husky.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index f0e9096..f3eabbf 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -45,10 +45,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/shusky/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.ripcurrent.rc -# insmod files -PRODUCT_COPY_FILES += \ - device/google/shusky/init.insmod.ripcurrent.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.ripcurrent.cfg - # Camera PRODUCT_COPY_FILES += \ device/google/shusky/media_profiles_ripcurrent.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml diff --git a/device-shiba.mk b/device-shiba.mk index 6776718..b56ea3f 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -43,10 +43,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/shusky/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.shiba.rc -# insmod files -PRODUCT_COPY_FILES += \ - device/google/shusky/init.insmod.shiba.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.shiba.cfg - # Camera PRODUCT_COPY_FILES += \ device/google/shusky/media_profiles_shiba.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml diff --git a/init.insmod.husky.cfg b/init.insmod.husky.cfg deleted file mode 100644 index 1372858..0000000 --- a/init.insmod.husky.cfg +++ /dev/null @@ -1,19 +0,0 @@ -########################################################## -# init.insmod.husky.cfg # -# This file contains husky specific kernel modules # -# to load at init time by init.insmod.sh script # -########################################################## - -# Load device specific kernel modules -# Modules here will be loaded *after* all common modules -modprobe|bcmdhd4398.ko -modprobe|snd-soc-cs35l41-i2c.ko -modprobe|ftm5.ko -modprobe|cl_dsp.ko -modprobe|input-cs40l26-i2c.ko -modprobe|snd-soc-cs40l26.ko - -# All device specific modules loaded -setprop|vendor.device.modules.ready -setprop|vendor.all.modules.ready -setprop|vendor.all.devices.ready diff --git a/init.insmod.ripcurrent.cfg b/init.insmod.ripcurrent.cfg deleted file mode 100644 index 9499e98..0000000 --- a/init.insmod.ripcurrent.cfg +++ /dev/null @@ -1,20 +0,0 @@ -########################################################## -# init.insmod.ripcurrent.cfg # -# This file contains ripcurrent specific kernel modules # -# to load at init time by init.insmod.sh script # -########################################################## - -# Load device specific kernel modules -# Modules here will be loaded *after* all common modules -modprobe|bcmdhd4398.ko -modprobe|snd-soc-cs35l41-i2c.ko -modprobe|ftm5.ko -modprobe|sec_touch.ko -modprobe|cl_dsp.ko -modprobe|input-cs40l26-i2c.ko -modprobe|snd-soc-cs40l26.ko - -# All device specific modules loaded -setprop|vendor.device.modules.ready -setprop|vendor.all.modules.ready -setprop|vendor.all.devices.ready diff --git a/init.insmod.shiba.cfg b/init.insmod.shiba.cfg deleted file mode 100644 index 85e9a01..0000000 --- a/init.insmod.shiba.cfg +++ /dev/null @@ -1,19 +0,0 @@ -########################################################## -# init.insmod.shiba.cfg # -# This file contains shiba specific kernel modules # -# to load at init time by init.insmod.sh script # -########################################################## - -# Load device specific kernel modules -# Modules here will be loaded *after* all common modules -modprobe|bcmdhd4398.ko -modprobe|snd-soc-cs35l41-i2c.ko -modprobe|goodix_brl_touch.ko -modprobe|cl_dsp.ko -modprobe|input-cs40l26-i2c.ko -modprobe|snd-soc-cs40l26.ko - -# All device specific modules loaded -setprop|vendor.device.modules.ready -setprop|vendor.all.modules.ready -setprop|vendor.all.devices.ready