From a0405c88dc03fa30045c18e57fd13c12d5bcae08 Mon Sep 17 00:00:00 2001
From: Zheng Pan <zhengpan@google.com>
Date: Mon, 6 Mar 2023 17:18:01 -0800
Subject: [PATCH] Comet: 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 check vendor_dlkm.img
Change-Id: Iebef45abfa310cc231f5a62a55746f3a055940fc
---
 conf/init.comet.rc    |  2 +-
 device-comet.mk       |  4 ----
 init.insmod.comet.cfg | 19 -------------------
 3 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 init.insmod.comet.cfg

diff --git a/conf/init.comet.rc b/conf/init.comet.rc
index c58adba..2e6c2e4 100644
--- a/conf/init.comet.rc
+++ b/conf/init.comet.rc
@@ -9,7 +9,7 @@ on early-boot
     wait_for_prop vendor.common.modules.ready 1
     start insmod_sh_comet
 
-service insmod_sh_comet /vendor/bin/insmod.sh /vendor/etc/init.insmod.${ro.hardware}.cfg
+service insmod_sh_comet /vendor/bin/insmod.sh /vendor_dlkm/etc/init.insmod.${ro.hardware}.cfg
     class main
     user root
     group root system
diff --git a/device-comet.mk b/device-comet.mk
index 50277b7..613ed7a 100644
--- a/device-comet.mk
+++ b/device-comet.mk
@@ -41,10 +41,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
         device/google/comet/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.comet.rc
 
-# insmod files
-PRODUCT_COPY_FILES += \
-	device/google/comet/init.insmod.comet.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/init.insmod.comet.cfg
-
 # Camera
 PRODUCT_COPY_FILES += \
 	device/google/comet/media_profiles_comet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
diff --git a/init.insmod.comet.cfg b/init.insmod.comet.cfg
deleted file mode 100644
index 1d62d28..0000000
--- a/init.insmod.comet.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-##########################################################
-#           init.insmod.comet.cfg                        #
-# This file contains comet 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