g12: init-files: Remove non-existant entries

* Remove module loads that don't exist.
* Remove imports of non-existant init-scripts.
* Remove non-existant service declarations.

Change-Id: I92a3386f85ac322d1c71726609d5a9fa87431d3c

diff --git a/init-files/init.amlogic.board.rc b/init-files/init.amlogic.board.rc
index 08e5e3b6ae709df68321e5039c6223a29160f0aa..2e86d57011cb5fa359094fdb597b9c382fcb444b 100644 (file)
--- a/init-files/init.amlogic.board.rc
+++ b/init-files/init.amlogic.board.rc
@@ -1,11 +1,7 @@
 import /vendor/etc/init/hw/init.amlogic.usb.rc
-import /vendor/etc/init/hw/init.amlogic.tb_detect.rc
 
 on post-fs-data
     insmod /vendor/lib/modules/mali.ko
-    insmod /vendor/lib/modules/dovi.ko
-    insmod /vendor/lib/sl_hdr.ko
-    insmod /vendor/lib/modules/atbm8881_fe.ko
     insmod /vendor/lib/modules/aml_hardware_dmx.ko
 
 on boot

diff --git a/init-files/init.amlogic.rc b/init-files/init.amlogic.rc
index dba018d0fedbdbcd5c651b689aab15127b73386a..97681666bbe008fa6ff83fb4ccc3f7949baa663c 100644 (file)
--- a/init-files/init.amlogic.rc
+++ b/init-files/init.amlogic.rc
@@ -3,7 +3,6 @@ import /vendor/etc/init/hw/init.amlogic.board.rc
 import /vendor/etc/init/hw/init.amlogic.wifi.rc
 import /vendor/etc/init/hw/init.amlogic.media.rc
 import /vendor/etc/init/hw/init.amlogic.wifi_buildin.rc
-import /vendor/etc/init/cppreopts_amlogic.rc
 
 on init
     # Support legacy paths
@@ -68,12 +67,6 @@ service fuse_loop /system/bin/sdcard -u 1023 -g 1023 /mnt/media_rw/loop /storage
     class late_start
     disabled
 
-# Set watchdog timer to 30 seconds and pet it every 10 seconds to get a 20 second margin
-#service watchdogd /sbin/watchdogd 10 20
-#    class core
-#    disabled
-#    seclabel u:r:watchdogd:s0
-
 service remotecfg /vendor/bin/remotecfg /vendor/etc/remote.conf
     class main
     oneshot
@@ -85,21 +78,6 @@ service hdcp_tx22 /vendor/bin/hdcp_tx22 \
     disabled
     oneshot
 
-#service hdcp_rx22 /vendor/bin/hdcp_rx22 \
-#    -f /mnt/vendor/param/firmware.le
-#    class main
-#    disabled
-#    oneshot
-#    seclabel u:r:hdcp_rx22:s0
-
-service factoryreset /vendor/bin/factoryreset.sh
-    class main
-    user root
-    group root
-    disabled
-    oneshot
-    seclabel u:r:install_recovery:s0
-
 service bugreport /system/bin/dumpstate -d -p -B -z \
     -o /data/user_de/0/com.android.shell/files/bugreports/bugreport
     class main

diff --git a/init-files/init.amlogic.wifi.rc b/init-files/init.amlogic.wifi.rc
index c55d64fbde86ddb7d0351ad78fe46aa3b9b13e5d..f0c1a9ed6cc4bd3c261331b03e4b5436f667350d 100644 (file)
--- a/init-files/init.amlogic.wifi.rc
+++ b/init-files/init.amlogic.wifi.rc
@@ -11,8 +11,3 @@ service wpa_supplicant /vendor/bin/hw/wpa_supplicant \
     socket wpa_wlan0 dgram 660 wifi wifi
     disabled
     oneshot
-
-service bcmdl /vendor/xbin/bcmdl -n /vendor/etc/wifi/43569/nvram_ap6269a2.nvm /vendor/etc/wifi/43569/fw_bcm43569a2_ag.bin.trx
-    class main
-    oneshot
-    disabled

diff --git a/init-files/init.recovery.amlogic.rc b/init-files/init.recovery.amlogic.rc
index c1663f1ad2df410d1cc328b13c1a502810efbfbe..7d41886aba3c9b1523ac6ef30bb4b73b7ee02db6 100644 (file)
--- a/init-files/init.recovery.amlogic.rc
+++ b/init-files/init.recovery.amlogic.rc
@@ -1,10 +1,3 @@
-on early-init
-    insmod /boot/dwc3.ko
-
-on init
-    chmod 0777 /sbin/systemcontrol_static
-    chmod 0777 /sbin/remotecfg
-
 on fs
     wait /dev/block/platform/${ro.boot.boot_devices}
     symlink /dev/block/platform/${ro.boot.boot_devices} /dev/block/bootdevice
@@ -45,22 +38,6 @@ service console /system/bin/sh
     seclabel u:r:shell:s0
     console
 
-service remotecfg3 /sbin/remotecfg -c /sbin/remote.cfg -t /sbin/remote.tab3 -d
-    oneshot
-    seclabel u:r:recovery:s0
-
-service remotecfg1 /sbin/remotecfg -c /sbin/remote.cfg -t /sbin/remote.tab1 -d
-    oneshot
-    seclabel u:r:recovery:s0
-
-service remotecfg2 /sbin/remotecfg -c /sbin/remote.cfg -t /sbin/remote.tab2 -d
-    oneshot
-    seclabel u:r:recovery:s0
-
-service systemcontrol /sbin/systemcontrol_static /sbin/mesondisplay.cfg
-    oneshot
-    seclabel u:r:recovery:s0
-
 on property:sys.usb.config=none && property:sys.usb.configfs=1
     setprop sys.usb.ffs.ready 0