ifc6410: Rename the files includes in the initrd

The should eliminate the need to post-process the initrd.

Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org>

6 files changed, 10 insertions, 10 deletions

diff --git a/device.mk b/device.mk
index b5b075b..c351c35 100644
--- a/device.mk
+++ b/device.mk
@@ -1,15 +1,15 @@
 PRODUCT_COPY_FILES := \
-    device/linaro/ifc6410/fstab.arm-versatileexpress:root/fstab.arm-versatileexpress \
+    device/linaro/ifc6410/fstab.qualcomm:root/fstab.qualcomm \
     device/linaro/ifc6410/egl.cfg:system/lib/egl/egl.cfg
 
 PRODUCT_COPY_FILES += \
-    device/linaro/ifc6410/init.arm-versatileexpress.rc:root/init.arm-versatileexpress.rc \
-    device/linaro/ifc6410/init.partitions.arm-versatileexpress.rc:root/init.partitions.arm-versatileexpress.rc \
-    device/linaro/ifc6410/ueventd.arm-versatileexpress.rc:root/ueventd.arm-versatileexpress.rc \
+    device/linaro/ifc6410/init.qualcomm.rc:root/init.qualcomm.rc \
+    device/linaro/ifc6410/init.partitions.qualcomm.rc:root/init.partitions.qualcomm.rc \
+    device/linaro/ifc6410/ueventd.qualcomm.rc:root/ueventd.qualcomm.rc \
     device/linaro/ifc6410/init.vexpress.sh:system/etc/init.vexpress.sh \
     device/linaro/ifc6410/initlogo.rle:root/initlogo.rle \
     device/linaro/ifc6410/set_irq_affinity.sh:root/sbin/set_irq_affinity.sh \
-    device/linaro/ifc6410/tweaks.arm-versatileexpress.sh:root/sbin/tweaks.arm-versatileexpress.sh \
+    device/linaro/ifc6410/tweaks.qualcomm.sh:root/sbin/tweaks.qualcomm.sh \
     device/linaro/build/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml \
     frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml
 
diff --git a/fstab.arm-versatileexpress b/fstab.qualcomm
index d145269..3ed6f36 100644
--- a/fstab.arm-versatileexpress
+++ b/fstab.qualcomm
@@ -4,6 +4,6 @@
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 
 
-/dev/block/mmcblk0p2    /system             ext4      ro                                                    wait
-/dev/block/mmcblk0p5    /data               ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=panic    wait
-/dev/block/mmcblk0p3    /cache              ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=panic    wait
+/dev/block/mmcblk0p12   /system             ext4      ro                                                    wait
+/dev/block/mmcblk0p13   /data               ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=panic    wait
+/dev/block/mmcblk0p15   /cache              ext4      noatime,nosuid,nodev,nomblk_io_submit,errors=panic    wait
diff --git a/init.partitions.arm-versatileexpress.rc b/init.partitions.qualcomm.rc
index 3a6b4fd..a235df3 100755
--- a/init.partitions.arm-versatileexpress.rc
+++ b/init.partitions.qualcomm.rc
@@ -28,4 +28,4 @@ on post-fs-data
     mkdir /data/media 0770 media_rw media_rw
 
 on fs
-    mount_all /fstab.arm-versatileexpress
+    mount_all /fstab.qualcomm
diff --git a/init.arm-versatileexpress.rc b/init.qualcomm.rc
index 702e5d2..0cb8d26 100755
--- a/init.arm-versatileexpress.rc
+++ b/init.qualcomm.rc
@@ -46,7 +46,7 @@ on post-fs-data
     # Set SELinux security contexts for files used by lava.
     restorecon_recursive /data/local/tmp/lava
 
-service boardtweaks /sbin/tweaks.arm-versatileexpress.sh
+service boardtweaks /sbin/tweaks.qualcomm.sh
     class main
     user root
     oneshot
diff --git a/tweaks.arm-versatileexpress.sh b/tweaks.qualcomm.sh
index a37fa56..a37fa56 100755
--- a/tweaks.arm-versatileexpress.sh
+++ b/tweaks.qualcomm.sh
diff --git a/ueventd.arm-versatileexpress.rc b/ueventd.qualcomm.rc
index ddd45f9..ddd45f9 100644
--- a/ueventd.arm-versatileexpress.rc
+++ b/ueventd.qualcomm.rc