commit 203bbb525af709ec97a6b18fd00a82f3b57ca397
author cayniarb <charlton.danielk@gmail.com> Mon Jan 16 12:03:41 2012 -0600
committer Gerrit Code Review <evervolv.gerrit2@Devel> Mon Jan 16 12:03:41 2012 -0600
tree 525261388b52b3c2e2376b4984fd5636eb21bf6e
parent 6abb4568439a67d40daa7da197872a5d2c87fa7f
parent e8a5a8c96d6379b6de17d9fedcef3c57121ef24b

Merge "ruby: update prebuilt kernel" into ics

prebuilt/root/init.ruby.rc

diff --git a/prebuilt/root/init.ruby.rc b/prebuilt/root/init.ruby.rc
index a5f1092..e2add19 100755
--- a/prebuilt/root/init.ruby.rc
+++ b/prebuilt/root/init.ruby.rc
@@ -1,32 +1,23 @@
-on emmc
+import init.ruby.usb.rc
+
+on early-fs
 
     mkdir /system
     mkdir /data 0771 system system
     mkdir /cache 0770 system cache
     mkdir /devlog 0700 root root
-    devwait emmc@system
-	mount ext4 emmc@system /system ro
-        #mount ext4 emmc@system /system remount noauto_da_alloc
-        #mount ext4 emmc@system /system remount ro
-    devwait emmc@userdata
-	mount ext4 emmc@userdata /data noatime nosuid nodev nodelalloc
-        #mount ext4 emmc@userdata /data remount noauto_da_alloc
-        #mount ext4 emmc@userdata /data remount noatime nosuid nodev
-    devwait emmc@cache
-	mount ext4 emmc@cache /cache noatime nosuid nodev nodelalloc
-        #mount ext4 emmc@cache /cache remount noauto_da_alloc
-        #mount ext4 emmc@cache /cache remount noatime nosuid nodev
-    devwait emmc@devlog
-	mount ext4 emmc@devlog /devlog noatime nosuid nodev nodelalloc
-        #mount ext4 emmc@devlog /devlog remount noauto_da_alloc
-        #mount ext4 emmc@devlog /devlog remount noatime nosuid nodev
 
+    mount ext4 /dev/block/mmcblk0p29 /system wait ro data=ordered noauto_da_alloc
+    mount ext4 /dev/block/mmcblk0p31 /data wait noatime nosuid nodev data=ordered noauto_da_alloc
+    mount ext4 /dev/block/mmcblk0p30 /cache wait noatime nosuid nodev data=ordered noauto_da_alloc
+    mount ext4 /dev/block/mmcblk0p32 /devlog wait noatime nosuid nodev data=ordered noauto_da_alloc
+
+on fs
     # 8x60: mount radio partition and create links for modem/q6 firmwares
     mkdir /vendor               0771 system system
     mkdir /vendor/firmware      0771 system system
     mkdir /vendor/firmware/misc 0771 system system
-    devwait emmc@radio
-    mount vfat emmc@radio /vendor/firmware/misc ro shortname=lower
+    mount vfat /dev/block/mmcblk0p17 /vendor/firmware/misc ro shortname=lower
     symlink /vendor/firmware/misc/q6.b07 /vendor/firmware/q6.b07
     symlink /vendor/firmware/misc/q6.b06 /vendor/firmware/q6.b06
     symlink /vendor/firmware/misc/q6.b05 /vendor/firmware/q6.b05
@@ -49,8 +40,7 @@
     symlink /vendor/firmware/misc/modem.b00 /vendor/firmware/modem.b00
     symlink /vendor/firmware/misc/modem.mdt /vendor/firmware/modem.mdt
     mkdir /vendor/firmware/misc_mdm 0771 system system
-    devwait emmc@mdm9k
-    mount vfat emmc@mdm9k /vendor/firmware/misc_mdm ro shortname=lower
+    mount vfat /dev/block/mmcblk0p18  /vendor/firmware/misc_mdm ro shortname=lower
     symlink /vendor/firmware/misc_mdm/image/amss.mbn /vendor/firmware/amss.mbn
     symlink /vendor/firmware/misc_mdm/image/dsp1.mbn /vendor/firmware/dsp1.mbn
     symlink /vendor/firmware/misc_mdm/image/dsp2.mbn /vendor/firmware/dsp2.mbn

prebuilt/root/kernel

diff --git a/prebuilt/root/kernel b/prebuilt/root/kernel
index 4a2ed92..7559281 100644
--- a/prebuilt/root/kernel
+++ b/prebuilt/root/kernel
Binary files differ

prebuilt/root/ueventd.ruby.rc

diff --git a/prebuilt/root/ueventd.ruby.rc b/prebuilt/root/ueventd.ruby.rc
index 1bc5d22..8876c8a 100644
--- a/prebuilt/root/ueventd.ruby.rc
+++ b/prebuilt/root/ueventd.ruby.rc
@@ -1,3 +1,6 @@
+/dev/system_bus_freq    0660    system      system
+/dev/cpu_dma_latency    0660    system      system
+
 #for audio
 /dev/msm_acdb	          0660   system     audio
 /dev/audience_a1026       0660   system     audio