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
This commit is contained in:
Zheng Pan 2023-03-01 14:10:03 -08:00
parent 75d678ff85
commit 43a46e4391
9 changed files with 3 additions and 73 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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