commit 19bb8e918c3d7b19df4baae83503186bed67c00c
author Jon Medhurst <tixy@linaro.org> Tue Feb 28 16:39:09 2012 +0000
committer Jon Medhurst <tixy@linaro.org> Tue Feb 28 16:39:09 2012 +0000
tree 41ebd9e2ae3aa489a295e6bde63a975a77e65ee2
parent df77a6af790449ab4e0af724f51aefcb6160226f

vexpress: init.rc tidyups

Stop using the deprecated init.rc from device/linaro/common and use
the one in system/core/rootdir instead.

Also, remove redundant gator startup entries in the vexpress specific
init file, as the generic init.rc handles this.

Change-Id: I0d75fdf1208041226e70c19d7fd420728e8c83eb
Signed-off-by: Jon Medhurst <tixy@linaro.org>

device.mk

diff --git a/device.mk b/device.mk
index bd1ab38..c179f93 100644
--- a/device.mk
+++ b/device.mk
@@ -3,7 +3,7 @@
     device/linaro/vexpress_a9/egl.cfg:system/lib/egl/egl.cfg
 
 PRODUCT_COPY_FILES += \
-    device/linaro/common/init.rc:root/init.rc \
+    system/core/rootdir/init.rc:root/init.rc \
     device/linaro/vexpress_a9/init.arm-versatileexpress.rc:root/init.arm-versatileexpress.rc \
     device/linaro/vexpress_a9/init.vexpress_a9.sh:system/etc/init.vexpress_a9.sh \
     device/linaro/vexpress_a9/initlogo.rle:root/initlogo.rle

init.arm-versatileexpress.rc

diff --git a/init.arm-versatileexpress.rc b/init.arm-versatileexpress.rc
index 8fb43d8..c103403 100644
--- a/init.arm-versatileexpress.rc
+++ b/init.arm-versatileexpress.rc
@@ -50,8 +50,6 @@
     chown system system /sys/class/graphics/fb0/fit_to_screen
     chown system system /sys/class/graphics/fb1/overlays
 
-    insmod /system/modules/gator.ko
-
 service faketsd /system/bin/faketsd
     class main
     user bluetooth
@@ -64,10 +62,3 @@
     class main
     user root
     oneshot
-
-#userspace daemon needed for gator
-service gatord /system/bin/gatord
-    class main
-    user root
-
-